Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-flexiantxendom0-3.2.10.git] / drivers / leds / leds-lm3530.c

diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c
index a3521da..0630e4f 100644 (file)
--- a/drivers/leds/leds-lm3530.c
+++ b/drivers/leds/leds-lm3530.c
@@ -422,7 +422,6 @@ err_class_register:
 err_reg_init:
        regulator_put(drvdata->regulator);
 err_regulator_get:
-       i2c_set_clientdata(client, NULL);
        kfree(drvdata);
 err_out:
        return err;
@@ -450,7 +449,7 @@ MODULE_DEVICE_TABLE(i2c, lm3530_id);
 
 static struct i2c_driver lm3530_i2c_driver = {
        .probe = lm3530_probe,
-       .remove = lm3530_remove,
+       .remove = __devexit_p(lm3530_remove),
        .id_table = lm3530_id,
        .driver = {
                .name = LM3530_NAME,