diff options
author | Johan Hovold <jhovold@gmail.com> | 2013-03-21 12:36:33 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 13:44:18 -0700 |
commit | d7f08452ffd3abbc2dbbf763cdec05496923f3b7 (patch) | |
tree | 6b5dec11d1deaf8038ec4ca9beeabaabcbb114a7 | |
parent | 80dfe0ceb31d92aca835d94f0255d93288e5ed12 (diff) | |
download | blackbird-op-linux-d7f08452ffd3abbc2dbbf763cdec05496923f3b7.tar.gz blackbird-op-linux-d7f08452ffd3abbc2dbbf763cdec05496923f3b7.zip |
USB: keyspan_pda: remove bogus disconnect test from dtr_rts
Remove bogus (and unnecessary) test for serial->dev being NULL in
dtr_rts.
The device is never cleared, and disconnect is handled for dtr_rts in
usb-serial core anyway.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/serial/keyspan_pda.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index 3b17d5d13dc8..0d992ba7bd05 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c @@ -595,12 +595,10 @@ static void keyspan_pda_dtr_rts(struct usb_serial_port *port, int on) { struct usb_serial *serial = port->serial; - if (serial->dev) { - if (on) - keyspan_pda_set_modem_info(serial, (1<<7) | (1<< 2)); - else - keyspan_pda_set_modem_info(serial, 0); - } + if (on) + keyspan_pda_set_modem_info(serial, (1 << 7) | (1 << 2)); + else + keyspan_pda_set_modem_info(serial, 0); } |