git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
[pandora-kernel.git]
/
drivers
/
staging
/
iio
/
adc
/
max1363_core.c
diff --git
a/drivers/staging/iio/adc/max1363_core.c
b/drivers/staging/iio/adc/max1363_core.c
index
20e2674
..
905f856
100644
(file)
--- a/
drivers/staging/iio/adc/max1363_core.c
+++ b/
drivers/staging/iio/adc/max1363_core.c
@@
-1011,7
+1011,6
@@
error_put_reg:
if (!IS_ERR(st->reg))
regulator_put(st->reg);
error_free_st:
if (!IS_ERR(st->reg))
regulator_put(st->reg);
error_free_st:
- i2c_set_clientdata(client, NULL);
kfree(st);
error_ret:
kfree(st);
error_ret:
@@
-1030,7
+1029,6
@@
static int max1363_remove(struct i2c_client *client)
regulator_disable(st->reg);
regulator_put(st->reg);
}
regulator_disable(st->reg);
regulator_put(st->reg);
}
- i2c_set_clientdata(client, NULL);
kfree(st);
return 0;
kfree(st);
return 0;