From 1aa969471c35f780ee11ab87ddeb41863e47e704 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 29 Jan 2004 00:03:40 -0800 Subject: [PATCH] [PATCH] USB: gcc-3.5: drivers/usb/gadget/net2280.c drivers/usb/gadget/net2280.c: In function `write_fifo': drivers/usb/gadget/net2280.c:527: error: `typeof' applied to a bit-field drivers/usb/gadget/net2280.c: In function `handle_ep_small': drivers/usb/gadget/net2280.c:2042: error: `typeof' applied to a bit-field --- drivers/usb/gadget/net2280.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index 915b1645a1de3..0a04360c8dfe0 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c @@ -534,7 +534,10 @@ write_fifo (struct net2280_ep *ep, struct usb_request *req) } /* write just one packet at a time */ - count = min (ep->ep.maxpacket, total); + count = ep->ep.maxpacket; + if (count > total) /* min() cannot be used on a bitfield */ + count = total; + VDEBUG (ep->dev, "write %s fifo (IN) %d bytes%s req %p\n", ep->ep.name, count, (count != ep->ep.maxpacket) ? " (short)" : "", @@ -2197,7 +2200,8 @@ static void handle_ep_small (struct net2280_ep *ep) unsigned len; len = req->req.length - req->req.actual; - len = min (ep->ep.maxpacket, len); + if (len > ep->ep.maxpacket) + len = ep->ep.maxpacket; req->req.actual += len; /* if we wrote it all, we're usually done */ -- 2.53.0