From cf2bbebedb323f8cf17ef352663d2d904d00f455 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 29 Mar 2004 22:10:11 -0800 Subject: [PATCH] [PATCH] USB: drivers/usb/gadget/epautoconf.c gcc-3.5 build fix drivers/usb/gadget/epautoconf.c: In function `ep_matches': drivers/usb/gadget/epautoconf.c:175: error: `typeof' applied to a bit-field --- drivers/usb/gadget/epautoconf.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c index 29c10be324e17..b15c44a5c63a3 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -171,9 +171,14 @@ ep_matches ( } /* report (variable) full speed bulk maxpacket */ - if (USB_ENDPOINT_XFER_BULK == type) - desc->wMaxPacketSize = cpu_to_le16 ( - min ((unsigned)64, ep->maxpacket)); + if (USB_ENDPOINT_XFER_BULK == type) { + int size = ep->maxpacket; + + /* min() doesn't work on bitfields with gcc-3.5 */ + if (size > 64) + size = 64; + desc->wMaxPacketSize = cpu_to_le16(size); + } return 1; } -- 2.53.0