diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2011-03-02 01:40:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-02 19:52:29 -0500 |
commit | 45d1b7ae205e39e95ec65747f8871661aaa105e4 (patch) | |
tree | f7c5e20394c4df1c7e062ade6e76026f2e8c1356 /drivers/usb/gadget | |
parent | 962f3ffa927f2e777a4193843c45ffa6e52ff4b6 (diff) |
usb-gadget: fix warning in ethernet
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>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/u_ether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c index 1eda968b5644..2ac1d2147325 100644 --- 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) | |||
241 | size -= size % out->maxpacket; | 241 | size -= size % out->maxpacket; |
242 | 242 | ||
243 | if (dev->port_usb->is_fixed) | 243 | if (dev->port_usb->is_fixed) |
244 | size = max(size, dev->port_usb->fixed_out_len); | 244 | size = max_t(size_t, size, dev->port_usb->fixed_out_len); |
245 | 245 | ||
246 | skb = alloc_skb(size + NET_IP_ALIGN, gfp_flags); | 246 | skb = alloc_skb(size + NET_IP_ALIGN, gfp_flags); |
247 | if (skb == NULL) { | 247 | if (skb == NULL) { |