1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index 60ac4684f875..bc696931fed7 100644
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -670,8 +670,6 @@ static int __devinit lm8323_probe(struct i2c_client *client,
                 goto fail1;
         }
 
-        i2c_set_clientdata(client, lm);
-
         lm->client = client;
         lm->idev = idev;
         mutex_init(&lm->lock);
@@ -753,6 +751,8 @@ static int __devinit lm8323_probe(struct i2c_client *client,
                 goto fail4;
         }
 
+        i2c_set_clientdata(client, lm);
+
         device_init_wakeup(&client->dev, 1);
         enable_irq_wake(client->irq);
 
@@ -778,6 +778,8 @@ static int __devexit lm8323_remove(struct i2c_client *client)
         struct lm8323_chip *lm = i2c_get_clientdata(client);
         int i;
 
+        i2c_set_clientdata(client, NULL);
+
         disable_irq_wake(client->irq);
         free_irq(client->irq, lm);
         cancel_work_sync(&lm->work);