---

yaml --- r: 289474 b: refs/heads/master c: 656d2b3 h: refs/heads/master v: v3
git-mirror · Feb 28, 2012 · f1ae9e4 · f1ae9e4
1 parent ba96cbb
commit f1ae9e4
Show file tree

Hide file tree

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