I can't remember if I had acked this one, so I resend it with my ack. Thanks to
Jonathan for the reminder.
David (or Gregh), could you pick that patch up for linux-next please ?
Cheers.
--
Robert
---
>From 8ee4657701d02536bec6d3743b3d02c17f4199e3 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@xxxxxxxxxxxxxxxxx>
Date: Sun, 11 Oct 2009 11:52:48 +0200
Subject: [PATCH] pxa27x_udc: avoid compiler warnings and misbehavior on buggy hardware
hardware reports wrong interrupt. Although such a situation should not
happen, the compiler complains about this access.
This patch adds a sanity check and generates warning to detect such
issues.
Acked-by: Robert Jarzmik <robert.jarzmik@xxxxxxx>
Signed-off-by: Enrico Scholz <enrico.scholz@xxxxxxxxxxxxxxxxx>
---
drivers/usb/gadget/pxa27x_udc.c | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index c686d45..e305799 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -2220,9 +2220,13 @@ static void irq_handle_data(int irq, struct pxa_udc *udc)
continue;
udc_writel(udc, UDCISR0, UDCISR_INT(i, UDCISR_INT_MASK));
- ep = &udc->pxa_ep[i];
- ep->stats.irqs++;
- handle_ep(ep);
+
+ WARN_ON(i >= ARRAY_SIZE(udc->pxa_ep));
+ if (i < ARRAY_SIZE(udc->pxa_ep)) {
+ ep = &udc->pxa_ep[i];
+ ep->stats.irqs++;
+ handle_ep(ep);
+ }
}
for (i = 16; udcisr1 != 0 && i < 24; udcisr1 >>= 2, i++) {
@@ -2230,9 +2234,12 @@ static void irq_handle_data(int irq, struct pxa_udc *udc)
if (!(udcisr1 & UDCISR_INT_MASK))
continue;
- ep = &udc->pxa_ep[i];
- ep->stats.irqs++;
- handle_ep(ep);
+ WARN_ON(i >= ARRAY_SIZE(udc->pxa_ep));
+ if (i < ARRAY_SIZE(udc->pxa_ep)) {
+ ep = &udc->pxa_ep[i];
+ ep->stats.irqs++;
+ handle_ep(ep);
+ }
}
}
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
