From 9d52dc980a3c13c4fb15bd6f1aede3083b1a5a53 Mon Sep 17 00:00:00 2001 From: Joachim Eastwood Date: Sun, 23 Sep 2012 22:56:00 +0200 Subject: [PATCH] --- yaml --- r: 326129 b: refs/heads/master c: f3f4bf5cf0896e58e9831ea53bcb8c7d88127d20 h: refs/heads/master i: 326127: 5c939010466ed6dc815b6b92d7401837618e680b v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ohci-at91.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2f5c258932bc..9fd8b45b08b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0220a3f01ab3d4673ca7087701d7466bea6b1d3a +refs/heads/master: f3f4bf5cf0896e58e9831ea53bcb8c7d88127d20 diff --git a/trunk/drivers/usb/host/ohci-at91.c b/trunk/drivers/usb/host/ohci-at91.c index aaa8d2bce217..0bf72f943b00 100644 --- a/trunk/drivers/usb/host/ohci-at91.c +++ b/trunk/drivers/usb/host/ohci-at91.c @@ -467,7 +467,8 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data) /* From the GPIO notifying the over-current situation, find * out the corresponding port */ at91_for_each_port(port) { - if (gpio_to_irq(pdata->overcurrent_pin[port]) == irq) { + if (gpio_is_valid(pdata->overcurrent_pin[port]) && + gpio_to_irq(pdata->overcurrent_pin[port]) == irq) { gpio = pdata->overcurrent_pin[port]; break; }