usb-gadget: fix warning in ethernet
authorStephen Hemminger <shemminger@vyatta.com>
Wed, 2 Mar 2011 06:40:57 +0000 (22:40 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 3 Mar 2011 00:52:29 +0000 (19:52 -0500)
Driver was taking max() of a size_t and u32 which causes complaint
about comparison of different types.

Stumbled on this accidently in my config, never used.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/gadget/u_ether.c

index 1eda968b5644249ac3a882c2c9756d573df63ffa..2ac1d21473253f73cdaea0b05b4b81fe027c61f1 100644 (file)
@@ -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) {
This page took 0.024614 seconds and 5 git commands to generate.