- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / drivers / input / touchscreen / ucb1400_ts.c

diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 095f84b..89dcbe7 100644 (file)
--- 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)
                goto err;
        }
 
-       error = ucb1400_ts_detect_irq(ucb);
-       if (error) {
-               printk(KERN_ERR "UCB1400: IRQ probe failed\n");
-               goto err_free_devs;
+       /* Only in case the IRQ line wasn't supplied, try detecting it */
+       if (ucb->irq < 0) {
+               error = ucb1400_ts_detect_irq(ucb);
+               if (error) {
+                       printk(KERN_ERR "UCB1400: IRQ probe failed\n");
+                       goto err_free_devs;
+               }
        }
 
        init_waitqueue_head(&ucb->ts_wait);