diff options
Diffstat (limited to 'drivers/usb/serial/cp210x.c')
-rw-r--r-- | drivers/usb/serial/cp210x.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index bd254ec97d14..ec9b0449ccf6 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c | |||
@@ -55,7 +55,7 @@ static int cp210x_carrier_raised(struct usb_serial_port *p); | |||
55 | 55 | ||
56 | static int debug; | 56 | static int debug; |
57 | 57 | ||
58 | static struct usb_device_id id_table [] = { | 58 | static const struct usb_device_id id_table[] = { |
59 | { USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */ | 59 | { USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */ |
60 | { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ | 60 | { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ |
61 | { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ | 61 | { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ |
@@ -91,11 +91,12 @@ static struct usb_device_id id_table [] = { | |||
91 | { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */ | 91 | { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */ |
92 | { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */ | 92 | { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */ |
93 | { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */ | 93 | { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */ |
94 | { USB_DEVICE(0x10C4, 0x81E8) }, /* Zephyr Bioharness */ | ||
94 | { USB_DEVICE(0x10C4, 0x81F2) }, /* C1007 HF band RFID controller */ | 95 | { USB_DEVICE(0x10C4, 0x81F2) }, /* C1007 HF band RFID controller */ |
95 | { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */ | 96 | { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */ |
96 | { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Comander 2 */ | 97 | { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Comander 2 */ |
97 | { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demostration module */ | 98 | { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demostration module */ |
98 | { USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */ | 99 | { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesys ETRX2USB */ |
99 | { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */ | 100 | { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */ |
100 | { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */ | 101 | { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */ |
101 | { USB_DEVICE(0x10C4, 0x8382) }, /* Cygnal Integrated Products, Inc. */ | 102 | { USB_DEVICE(0x10C4, 0x8382) }, /* Cygnal Integrated Products, Inc. */ |
@@ -312,11 +313,6 @@ static int cp210x_set_config(struct usb_serial_port *port, u8 request, | |||
312 | return -EPROTO; | 313 | return -EPROTO; |
313 | } | 314 | } |
314 | 315 | ||
315 | /* Single data value */ | ||
316 | result = usb_control_msg(serial->dev, | ||
317 | usb_sndctrlpipe(serial->dev, 0), | ||
318 | request, REQTYPE_HOST_TO_DEVICE, data[0], | ||
319 | 0, NULL, 0, 300); | ||
320 | return 0; | 316 | return 0; |
321 | } | 317 | } |
322 | 318 | ||
@@ -612,7 +608,7 @@ static void cp210x_set_termios(struct tty_struct *tty, | |||
612 | baud); | 608 | baud); |
613 | if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV, | 609 | if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV, |
614 | ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) { | 610 | ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) { |
615 | dbg("Baud rate requested not supported by device\n"); | 611 | dbg("Baud rate requested not supported by device"); |
616 | baud = tty_termios_baud_rate(old_termios); | 612 | baud = tty_termios_baud_rate(old_termios); |
617 | } | 613 | } |
618 | } | 614 | } |