summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2005-06-03 08:01:35 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-03 08:16:17 -0700
commitf4d340cf869b2b63e1043eed72aa2eab6fa2cb2c (patch)
tree34b9a08595d938f37ec3cdf6fd86df32109cf80d
parent39a66b8d22a36cfa1a48f7f59c6a4639d9c99653 (diff)
downloadop-kernel-dev-f4d340cf869b2b63e1043eed72aa2eab6fa2cb2c.zip
op-kernel-dev-f4d340cf869b2b63e1043eed72aa2eab6fa2cb2c.tar.gz
[PATCH] USB: resolve Zaurus problem
This "obvious" one-liner is needed to recognize Zaurus SL 6000; it just checks two GUIDs not just one. OSDL bugids #4512 and #4545 seem to be duplicates of this report. From: Gerald Skerbitz <gsker@tcfreenet.org> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-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 85476e7..4cbb408 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -2765,7 +2765,7 @@ static int blan_mdlm_bind (struct usbnet *dev, struct usb_interface *intf)
}
/* expect bcdVersion 1.0, ignore */
if (memcmp(&desc->bGUID, blan_guid, 16)
- && memcmp(&desc->bGUID, blan_guid, 16) ) {
+ && memcmp(&desc->bGUID, safe_guid, 16) ) {
/* hey, this one might _really_ be MDLM! */
dev_dbg (&intf->dev, "MDLM guid\n");
goto bad_desc;
OpenPOWER on IntegriCloud