projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[linux-2.6-block.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 790d1cc9cdc3298527d00afca9b2a20f1707d615..773f1d1d9c6ee490312f7138c9e96a870eb48ca2 100644
(file)
--- a/
drivers/staging/iio/adc/max1363_core.c
+++ b/
drivers/staging/iio/adc/max1363_core.c
@@
-557,6
+557,7
@@
error_put_reg:
if (!IS_ERR(st->reg))
regulator_put(st->reg);
error_free_st:
+ i2c_set_clientdata(client, NULL);
kfree(st);
error_ret:
@@
-574,6
+575,7
@@
static int max1363_remove(struct i2c_client *client)
regulator_disable(st->reg);
regulator_put(st->reg);
}
+ i2c_set_clientdata(client, NULL);
kfree(st);
return 0;