diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
| commit | 08fa16b6b75005c120b59d00ae42a0b7cc68db45 (patch) | |
| tree | c5f22412467f72dd0c7291bbb958a9485e894f02 /drivers/input/keyboard/lm8323.c | |
| parent | 1796b983cc4cbbed5e9e478b03591609a2c21987 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into next
Diffstat (limited to 'drivers/input/keyboard/lm8323.c')
| -rw-r--r-- | drivers/input/keyboard/lm8323.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c index 6ecd37a845f2..f7c2a166576b 100644 --- a/drivers/input/keyboard/lm8323.c +++ b/drivers/input/keyboard/lm8323.c | |||
| @@ -780,8 +780,6 @@ static int __devexit lm8323_remove(struct i2c_client *client) | |||
| 780 | struct lm8323_chip *lm = i2c_get_clientdata(client); | 780 | struct lm8323_chip *lm = i2c_get_clientdata(client); |
| 781 | int i; | 781 | int i; |
| 782 | 782 | ||
| 783 | i2c_set_clientdata(client, NULL); | ||
| 784 | |||
| 785 | disable_irq_wake(client->irq); | 783 | disable_irq_wake(client->irq); |
| 786 | free_irq(client->irq, lm); | 784 | free_irq(client->irq, lm); |
| 787 | cancel_work_sync(&lm->work); | 785 | cancel_work_sync(&lm->work); |