aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/hp680_ts_input.c
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-03-11 16:06:03 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-12 22:17:56 -0700
commitb51425becfe127e0c17a8501ffa079b37241ed11 (patch)
tree7bcdacfb3909c0bd40c7f1b6111723aa5270cb14 /drivers/input/touchscreen/hp680_ts_input.c
parentMerge branch 'for-next' of github.com:rydberg/linux into next (diff)
downloadlinux-dev-b51425becfe127e0c17a8501ffa079b37241ed11.tar.xz
linux-dev-b51425becfe127e0c17a8501ffa079b37241ed11.zip
Input: hp680_ts_input - ensure arguments to request_irq and free_irq are compatible
Change 0 to NULL in the last argument of request_irq, since the argument should have pointer type and so that the last argument of request_irq syntactically matches the second argument of the later call to free_irq. Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen/hp680_ts_input.c')
-rw-r--r--drivers/input/touchscreen/hp680_ts_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index 639a6044183d..85cf9bee8018 100644
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -93,7 +93,7 @@ static int __init hp680_ts_init(void)
hp680_ts_dev->phys = "hp680_ts/input0";
if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt,
- 0, MODNAME, 0) < 0) {
+ 0, MODNAME, NULL) < 0) {
printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n",
HP680_TS_IRQ);
err = -EBUSY;