diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 13:44:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 13:44:30 -0700 |
| commit | 5672bc8181b189c05ccc29c692491500682a1b49 (patch) | |
| tree | 3a8048e29f65664d7add769d0da8a26c65845840 /drivers/regulator | |
| parent | 27b3d80a7b6adcf069b5e869e4efcc3a79f88a91 (diff) | |
| parent | 925bb9c649cf8d7200549b395f2ae291833dd494 (diff) | |
| download | linux-5672bc8181b189c05ccc29c692491500682a1b49.tar.gz linux-5672bc8181b189c05ccc29c692491500682a1b49.tar.bz2 linux-5672bc8181b189c05ccc29c692491500682a1b49.zip | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
of/i2c: Fix module load order issue caused by of_i2c.c
i2c: Fix checks which cause legacy suspend to never get called
i2c-pca: Fix waitforcompletion() return value
i2c: Fix for suspend/resume issue
i2c: Remove obsolete cleanup for clientdata
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/ad5398.c | 1 | ||||
| -rw-r--r-- | drivers/regulator/isl6271a-regulator.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c index df1fb53c09d2..a4be41614eeb 100644 --- a/drivers/regulator/ad5398.c +++ b/drivers/regulator/ad5398.c @@ -256,7 +256,6 @@ static int __devexit ad5398_remove(struct i2c_client *client) regulator_unregister(chip->rdev); kfree(chip); - i2c_set_clientdata(client, NULL); return 0; } diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c index d61ecb885a8c..b8cc6389a541 100644 --- a/drivers/regulator/isl6271a-regulator.c +++ b/drivers/regulator/isl6271a-regulator.c @@ -191,8 +191,6 @@ static int __devexit isl6271a_remove(struct i2c_client *i2c) struct isl_pmic *pmic = i2c_get_clientdata(i2c); int i; - i2c_set_clientdata(i2c, NULL); - for (i = 0; i < 3; i++) regulator_unregister(pmic->rdev[i]); |