Title: [4153] branches/2008R1/drivers/input/joystick/ad7142.c:
- Revision
- 4153
- Author
- cooloney
- Date
- 2008-01-28 00:36:56 -0600 (Mon, 28 Jan 2008)
Log Message
[#3852] pass right parameter to free_irq function, otherwise the irq won't be free
Diffstat
ad7142.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
Modified Paths
Diff
Modified: branches/2008R1/drivers/input/joystick/ad7142.c (4152 => 4153)
--- branches/2008R1/drivers/input/joystick/ad7142.c 2008-01-28 06:29:39 UTC (rev 4152)
+++ branches/2008R1/drivers/input/joystick/ad7142.c 2008-01-28 06:36:56 UTC (rev 4153)
@@ -459,7 +459,7 @@
fail_register:
input_free_device(input_dev);
fail_allocate:
- free_irq(data->irq, ad7142_interrupt);
+ free_irq(data->irq, data);
fail_check:
i2c_detach_client(client);
fail_attach:
@@ -475,16 +475,19 @@
static int ad7142_detach(struct i2c_client *client)
{
struct ad7142_data *data = ""
+ int rc;
- free_irq(data->irq, ad7142_interrupt);
+ free_irq(data->irq, data);
flush_scheduled_work();
input_unregister_device(data->input_dev);
+ rc = i2c_detach_client(client);
+
kfree(data);
- return i2c_detach_client(client);
+ return rc;
}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
