Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338709
b: refs/heads/master
c: 1a88d5e
h: refs/heads/master
i:
  338707: 968c909
v: v3
  • Loading branch information
Peter Korsgaard authored and Greg Kroah-Hartman committed Nov 26, 2012
1 parent 95cf91a commit 963efa3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 356fe44f4b8ece867bdb9876b1854d7adbef9de2
refs/heads/master: 1a88d5eee2ef2ad1d3c4e32043e9c4c5347d4fc1
2 changes: 1 addition & 1 deletion trunk/drivers/usb/serial/ftdi_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1783,7 +1783,7 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
struct usb_device *udev = serial->dev;

if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) ||
(udev->product && !strcmp(udev->product, "BeagleBone/XDS100")))
(udev->product && !strcmp(udev->product, "BeagleBone/XDS100V2")))
return ftdi_jtag_probe(serial);

return 0;
Expand Down

0 comments on commit 963efa3

Please sign in to comment.