Re: [linux-usb-devel] [GIT PATCH] More USB bugfixes for 2.6.12-rc5

[David Brownell <david-b@pacbell.net>]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

On Friday 03 June 2005 1:58 am, Greg KH wrote:
> Here are some more USB patches for the 2.6.12-rc5 tree. 

And attached, one more (non-GIT) patch to resolve a Zaurus problem.
OSDL bugids #4512 and #4545 seem to be duplicates of this report.
Please merge for 2.6.12-final... it's an obvious one-line fix.

- Dave


[-- Attachment #2: usbnet_zaurus.patch --]
[-- Type: text/x-diff, Size: 753 bytes --]

This "obvious" one-liner is needed to recognize Zaurus SL 6000;
it just checks two GUIDs not just one. 

From: Gerald Skerbitz <gsker@tcfreenet.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

--- linux-2.6.12-rc5/drivers/usb/net/usbnet.c.orig	2005-06-01 18:06:20.000000000 -0500
+++ linux-2.6.12-rc5/drivers/usb/net/usbnet.c	2005-06-01 18:29:30.000000000 -0500
@@ -2765,7 +2765,7 @@ static int blan_mdlm_bind (struct usbnet
 			}
 			/* 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;