From 7dd3f8aaa0618d00598ce982f5127432fe69cfed Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Mon, 20 Jun 2011 23:01:14 +0200 Subject: [PATCH] --- yaml --- r: 261797 b: refs/heads/master c: 7c4509b4cd1d99a1ea22ee4c1da4d3dbb9771c95 h: refs/heads/master i: 261795: 659f16a3296bb79562e2dda427509a5c8eff76d4 v: v3 --- [refs] | 2 +- trunk/drivers/power/max17042_battery.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d286418fc99c..292c762d2916 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28d48f04ead41438f14d167fe61fd179de7029f3 +refs/heads/master: 7c4509b4cd1d99a1ea22ee4c1da4d3dbb9771c95 diff --git a/trunk/drivers/power/max17042_battery.c b/trunk/drivers/power/max17042_battery.c index c5c8805156cb..09f7496a6d8c 100644 --- a/trunk/drivers/power/max17042_battery.c +++ b/trunk/drivers/power/max17042_battery.c @@ -183,7 +183,6 @@ static int __devinit max17042_probe(struct i2c_client *client, ret = power_supply_register(&client->dev, &chip->battery); if (ret) { dev_err(&client->dev, "failed: power supply register\n"); - i2c_set_clientdata(client, NULL); kfree(chip); return ret; } @@ -202,7 +201,6 @@ static int __devexit max17042_remove(struct i2c_client *client) struct max17042_chip *chip = i2c_get_clientdata(client); power_supply_unregister(&chip->battery); - i2c_set_clientdata(client, NULL); kfree(chip); return 0; }