diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-16 17:42:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-16 17:42:10 +0200 |
| commit | e06226e66beafd6118aa81b511d88cb549ad7ea5 (patch) | |
| tree | 8ef298d1e1c866566fdc0463c22d196d65771a9a | |
| parent | 08c5cd37480f59ea39682f4585d92269be6b1424 (diff) | |
| parent | f190fd92458da3e869b4e2c6289e2c617490ae53 (diff) | |
| download | linux-richacl-e06226e66beafd6118aa81b511d88cb549ad7ea5.tar.gz | |
Merge tag 'usb-serial-4.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.8-rc7
Here's another Infineon flashloader device id.
Signed-off-by: Johan Hovold <johan@kernel.org>
| -rw-r--r-- | drivers/usb/serial/usb-serial-simple.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c index a204782ae530e1..e98b6e57b703db 100644 --- a/drivers/usb/serial/usb-serial-simple.c +++ b/drivers/usb/serial/usb-serial-simple.c @@ -54,7 +54,8 @@ DEVICE(funsoft, FUNSOFT_IDS); /* Infineon Flashloader driver */ #define FLASHLOADER_IDS() \ { USB_DEVICE_INTERFACE_CLASS(0x058b, 0x0041, USB_CLASS_CDC_DATA) }, \ - { USB_DEVICE(0x8087, 0x0716) } + { USB_DEVICE(0x8087, 0x0716) }, \ + { USB_DEVICE(0x8087, 0x0801) } DEVICE(flashloader, FLASHLOADER_IDS); /* Google Serial USB SubClass */ |