From 3ce1deecf065720fb41947b7b4a8e6a2462ac0cc Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Fri, 21 May 2010 00:50:17 +0200 Subject: [PATCH] --- yaml --- r: 199415 b: refs/heads/master c: 28ade0f217a3a3ff992b01e06e6e425c250a8406 h: refs/heads/master i: 199413: 181834957923ee8ae3edb4844e98edb4440cec22 199411: 6c24da0f24cb165d042f3839498f80b7170e6575 199407: 35e924a9ee71e5339280c86eef2750dc357f36e2 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/88pm860x-i2c.c | 1 - trunk/drivers/mfd/max8925-i2c.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5ba9eb2fcd81..48d213497002 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62579266cf9caca5b999560be2b5ceee42fc4d4d +refs/heads/master: 28ade0f217a3a3ff992b01e06e6e425c250a8406 diff --git a/trunk/drivers/mfd/88pm860x-i2c.c b/trunk/drivers/mfd/88pm860x-i2c.c index b0bade1881d4..c933b64d1283 100644 --- a/trunk/drivers/mfd/88pm860x-i2c.c +++ b/trunk/drivers/mfd/88pm860x-i2c.c @@ -200,7 +200,6 @@ static int __devexit pm860x_remove(struct i2c_client *client) pm860x_device_exit(chip); i2c_unregister_device(chip->companion); - i2c_set_clientdata(chip->companion, NULL); i2c_set_clientdata(chip->client, NULL); i2c_set_clientdata(client, NULL); kfree(chip); diff --git a/trunk/drivers/mfd/max8925-i2c.c b/trunk/drivers/mfd/max8925-i2c.c index d9fd8785da4d..e73f3f5252a8 100644 --- a/trunk/drivers/mfd/max8925-i2c.c +++ b/trunk/drivers/mfd/max8925-i2c.c @@ -173,8 +173,6 @@ static int __devexit max8925_remove(struct i2c_client *client) max8925_device_exit(chip); i2c_unregister_device(chip->adc); i2c_unregister_device(chip->rtc); - i2c_set_clientdata(chip->adc, NULL); - i2c_set_clientdata(chip->rtc, NULL); i2c_set_clientdata(chip->i2c, NULL); kfree(chip); return 0;