diff options
Diffstat (limited to 'drivers/input/touchscreen/ucb1400_ts.c')
-rw-r--r-- | drivers/input/touchscreen/ucb1400_ts.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index 095f84b1f56e..89dcbe7b4b02 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c | |||
@@ -355,10 +355,13 @@ static int ucb1400_ts_probe(struct platform_device *dev) | |||
355 | goto err; | 355 | goto err; |
356 | } | 356 | } |
357 | 357 | ||
358 | error = ucb1400_ts_detect_irq(ucb); | 358 | /* Only in case the IRQ line wasn't supplied, try detecting it */ |
359 | if (error) { | 359 | if (ucb->irq < 0) { |
360 | printk(KERN_ERR "UCB1400: IRQ probe failed\n"); | 360 | error = ucb1400_ts_detect_irq(ucb); |
361 | goto err_free_devs; | 361 | if (error) { |
362 | printk(KERN_ERR "UCB1400: IRQ probe failed\n"); | ||
363 | goto err_free_devs; | ||
364 | } | ||
362 | } | 365 | } |
363 | 366 | ||
364 | init_waitqueue_head(&ucb->ts_wait); | 367 | init_waitqueue_head(&ucb->ts_wait); |