From: Johan Hovold <jhovold@gmail.com>
Date: Thu, 21 Mar 2013 11:36:33 +0000 (+0100)
Subject: USB: keyspan_pda: remove bogus disconnect test from dtr_rts
X-Git-Tag: v3.10-rc1~190^2~193
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=d7f08452ffd3abbc2dbbf763cdec05496923f3b7;p=cascardo%2Flinux.git

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>
---

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);
 }