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/mouse | |
| parent | 1796b983cc4cbbed5e9e478b03591609a2c21987 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into next
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/synaptics_i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c index 8291e7399ffa..0ae62f0bcb32 100644 --- a/drivers/input/mouse/synaptics_i2c.c +++ b/drivers/input/mouse/synaptics_i2c.c | |||
| @@ -613,7 +613,6 @@ static int __devexit synaptics_i2c_remove(struct i2c_client *client) | |||
| 613 | free_irq(client->irq, touch); | 613 | free_irq(client->irq, touch); |
| 614 | 614 | ||
| 615 | input_unregister_device(touch->input); | 615 | input_unregister_device(touch->input); |
| 616 | i2c_set_clientdata(client, NULL); | ||
| 617 | kfree(touch); | 616 | kfree(touch); |
| 618 | 617 | ||
| 619 | return 0; | 618 | return 0; |