From: Komal Shah Date: Tue, 28 Mar 2006 15:01:44 +0000 (-0800) Subject: [PATCH] ARM: OMAP2: Fix H4 keypad X-Git-Tag: v2.6.16-omap1~7 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=ddb984bccf14d29af127d4ba05e50b08a7c9490f [PATCH] ARM: OMAP2: Fix H4 keypad Fix keypad on H4, where we don't have interrupt resource. Signed-off-by: Komal Shah Signed-off-by: Tony Lindgren --- diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index ff1acb5b48f..98bbe976c8d 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c @@ -56,7 +56,7 @@ static int kp_cur_group = -1; struct omap_kp { struct input_dev *input; struct timer_list timer; - unsigned int irq; + int irq; unsigned int rows; unsigned int cols; }; @@ -358,7 +358,7 @@ static int __init omap_kp_probe(struct platform_device *pdev) kp_tasklet.data = (unsigned long) omap_kp; omap_kp->irq = platform_get_irq(pdev, 0); - if (omap_kp->irq) { + if (omap_kp->irq >= 0) { if (request_irq(omap_kp->irq, omap_kp_interrupt, 0, "omap-keypad", omap_kp) < 0) return -EINVAL;