Merge tag 'sound-3.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[~andy/linux] / drivers / net / usb / sr9800.c

diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c
index 4175eb9fdecab2ee6e6442a45cd1961b9f18446d..b94a0fbb8b3b5a74ed466c4d5a66e25f4f2e0edc 100644 (file)
--- a/drivers/net/usb/sr9800.c
+++ b/drivers/net/usb/sr9800.c
@@ -63,6 +63,10 @@ static int sr_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 {
        int offset = 0;
 
+       /* This check is no longer done by usbnet */
+       if (skb->len < dev->net->hard_header_len)
+               return 0;
+
        while (offset + sizeof(u32) < skb->len) {
                struct sk_buff *sr_skb;
                u16 size;
@@ -823,7 +827,7 @@ static int sr9800_bind(struct usbnet *dev, struct usb_interface *intf)
                dev->rx_urb_size =
                        SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_2K].size;
        }
-       netdev_dbg(dev->net, "%s : setting rx_urb_size with : %ld\n", __func__,
+       netdev_dbg(dev->net, "%s : setting rx_urb_size with : %zu\n", __func__,
                   dev->rx_urb_size);
        return 0;