From 87bef96b4c090caefbb2fd0f49cb67a1e41dc94a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 29 Feb 2012 10:05:37 +0100
Subject: [PATCH] --- yaml --- r: 289607 b: refs/heads/master c:
 444aa7fa9bd752d19ce472d3e02558b987c3cc67 h: refs/heads/master i:   289605:
 26d8d36281f339109e0f11cd2c98158d77307b54   289603:
 bfb6044b4ea49ee65650d9ba5eb8a803352cc724   289599:
 8de44224eaaa22660b148232459f26f327d1819d v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/usb/serial/ftdi_sio.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4fef313b6fb2..3220ba500397 100644
--- 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
index 989262606684..b160c252bf13 100644
--- 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;