---

yaml --- r: 289607 b: refs/heads/master c: 444aa7f h: refs/heads/master i: 289605: 26d8d36 289603: bfb6044 289599: 8de4422 v: v3
git-mirror · Mar 1, 2012 · 87bef96 · 87bef96
1 parent 9245c8b
commit 87bef96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7204cf584836c24b4b06e4ad4a8e6bb8ea84908e
+refs/heads/master: 444aa7fa9bd752d19ce472d3e02558b987c3cc67
diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -1769,8 +1769,8 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
 
 	dbg("%s", __func__);
 
-	if ((udev->manufacturer) &&
-	    (strcmp(udev->manufacturer, "CALAO Systems") == 0))
+	if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) ||
+	    (udev->product && !strcmp(udev->product, "BeagleBone/XDS100")))
 		return ftdi_jtag_probe(serial);
 
 	return 0;