Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[firefly-linux-kernel-4.4.55.git] / drivers / input / touchscreen / hp680_ts_input.c

diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index 639a6044183db76e2b748dbd74126b3ce1627899..85cf9bee80183bc117475cc562af0fac459b2473 100644 (file)
--- 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;