summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorlepton2005-08-23 02:06:14 +0200
committerLinus Torvalds2005-08-24 04:59:38 +0200
commit2bbfb16bf345acd81ab1e6e3d4b35964650517ac (patch)
tree7eeecfe2e5df567d1d725fae962ddf1faabb90a5 /drivers/usb
parent[PATCH] i386: fix incorrect FP signal code (diff)
downloadkernel-qcow2-linux-2bbfb16bf345acd81ab1e6e3d4b35964650517ac.tar.gz
kernel-qcow2-linux-2bbfb16bf345acd81ab1e6e3d4b35964650517ac.tar.xz
kernel-qcow2-linux-2bbfb16bf345acd81ab1e6e3d4b35964650517ac.zip
[PATCH] usbnet oops fix
There's a "return the wrong SKB" error in the GL620A cable minidriver (for "usbnet") which can oops. This would not appear when talking Linux-to-Linux, only Linux-to-Windows (for recent Linuxes). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/net/usbnet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 576f3b852fce..4528a00c45b0 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -1922,7 +1922,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb)
// copy the packet data to the new skb
memcpy(skb_put(gl_skb, size), packet->packet_data, size);
- skb_return (dev, skb);
+ skb_return (dev, gl_skb);
}
// advance to the next packet