Merge branch 'docs-next' of git://git.lwn.net/linux-2.6

[linux.git] / drivers / usb / gadget / u_ether.c

diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index 1eda968b5644249ac3a882c2c9756d573df63ffa..2ac1d21473253f73cdaea0b05b4b81fe027c61f1 100644 (file)
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -241,7 +241,7 @@ rx_submit(struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)
        size -= size % out->maxpacket;
 
        if (dev->port_usb->is_fixed)
-               size = max(size, dev->port_usb->fixed_out_len);
+               size = max_t(size_t, size, dev->port_usb->fixed_out_len);
 
        skb = alloc_skb(size + NET_IP_ALIGN, gfp_flags);
        if (skb == NULL) {