---

yaml --- r: 235392 b: refs/heads/master c: 45d1b7a h: refs/heads/master v: v3
git-mirror · Mar 3, 2011 · 82abc14 · 82abc14
1 parent 9f50e03
commit 82abc14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 962f3ffa927f2e777a4193843c45ffa6e52ff4b6
+refs/heads/master: 45d1b7ae205e39e95ec65747f8871661aaa105e4
diff --git a/trunk/drivers/usb/gadget/u_ether.c b/trunk/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) {