--- drivers/usb/serial/cp210x.c

+++ drivers/usb/serial/cp210x.c

@@ -51,11 +51,11 @@ static void cp210x_break_ctl(struct tty_

static int cp210x_startup(struct usb_serial *);

static void cp210x_disconnect(struct usb_serial *);

static void cp210x_dtr_rts(struct usb_serial_port *p, int on);

+static int cp210x_carrier_raised(struct usb_serial_port *p);

static int debug;

static struct usb_device_id id_table [] = {

- { USB_DEVICE(0x045B, 0x0053) }, /* Renesas RX610 RX-Stick */

{ USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */

{ USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */

{ USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */

@@ -87,9 +87,9 @@ static struct usb_device_id id_table []

{ USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */

{ USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */

{ USB_DEVICE(0x10C4, 0x813F) }, /* Tams Master Easy Control */

+ { USB_DEVICE(0x10C4, 0x8149) }, /* West Mountain Radio Computerized Battery Analyzer */

{ USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */

{ USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */

- { USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */

{ USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */

{ USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */

{ USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */

@@ -109,11 +109,8 @@ static struct usb_device_id id_table []

{ USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */

{ USB_DEVICE(0x10C4, 0x8382) }, /* Cygnal Integrated Products, Inc. */

{ USB_DEVICE(0x10C4, 0x83A8) }, /* Amber Wireless AMB2560 */

- { USB_DEVICE(0x10C4, 0x83D8) }, /* DekTec DTA Plus VHF/UHF Booster/Attenuator */

{ USB_DEVICE(0x10C4, 0x8411) }, /* Kyocera GPS Module */

- { USB_DEVICE(0x10C4, 0x8418) }, /* IRZ Automation Teleport SG-10 GSM/GPRS Modem */

{ USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */

- { USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */

{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */

{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */

{ USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */

@@ -127,14 +124,9 @@ static struct usb_device_id id_table []

{ USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */

{ USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */

{ USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */

- { USB_DEVICE(0x16DC, 0x0010) }, /* W-IE-NE-R Plein & Baus GmbH PL512 Power Supply */

- { USB_DEVICE(0x16DC, 0x0011) }, /* W-IE-NE-R Plein & Baus GmbH RCM Remote Control for MARATON Power Supply */

- { USB_DEVICE(0x16DC, 0x0012) }, /* W-IE-NE-R Plein & Baus GmbH MPOD Multi Channel Power Supply */

- { USB_DEVICE(0x16DC, 0x0015) }, /* W-IE-NE-R Plein & Baus GmbH CML Control, Monitoring and Data Logger */

{ USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */

{ USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */

{ USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */

- { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */

{ USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */

{ } /* Terminating Entry */

};

@@ -165,7 +157,8 @@ static struct usb_serial_driver cp210x_d

.tiocmset = cp210x_tiocmset,

.attach = cp210x_startup,

.disconnect = cp210x_disconnect,

- .dtr_rts = cp210x_dtr_rts

+ .dtr_rts = cp210x_dtr_rts,

+ .carrier_raised = cp210x_carrier_raised

};

/* Config request types */

@@ -226,8 +219,8 @@ static struct usb_serial_driver cp210x_d

#define BITS_STOP_2 0x0002

/* CP210X_SET_BREAK */

-#define BREAK_ON 0x0001

-#define BREAK_OFF 0x0000

+#define BREAK_ON 0x0000

+#define BREAK_OFF 0x0001

/* CP210X_(SET_MHS|GET_MDMSTS) */

#define CONTROL_DTR 0x0001

@@ -799,6 +792,15 @@ static int cp210x_tiocmget (struct tty_s

return result;

}

+static int cp210x_carrier_raised(struct usb_serial_port *p)

+{

+ unsigned int control;

+ cp210x_get_config(p, CP210X_GET_MDMSTS, &control, 1);

+ if (control & CONTROL_DCD)

+ return 1;

+ return 0;

+}

+

static void cp210x_break_ctl (struct tty_struct *tty, int break_state)

{

struct usb_serial_port *port = tty->driver_data;