aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-25 03:53:09 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-25 03:53:09 -0800
commit2f9889a20cd2854bc6305198255c617b0b4eb719 (patch)
tree1b577cd6c8fe1b2233e63ad1c8ed999615315d3c
parentab153d84d9609b4e6f53632a6f14b882e866cb47 (diff)
Revert "hso: Fix crashes on close."
This reverts commit 4a3e818181e1baf970e9232ca8b747e233176b87. On request from Alan Cox. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/usb/hso.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 39df44f99d6..c5c1aeae94f 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -1235,11 +1235,6 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
}
mutex_lock(&serial->parent->mutex);
- /* check for port already opened, if not set the termios */
- /* The serial->open count needs to be here as hso_serial_close
- * will be called even if hso_serial_open returns -ENODEV.
- */
- serial->open_count++;
result = usb_autopm_get_interface(serial->parent->interface);
if (result < 0)
goto err_out;
@@ -1251,6 +1246,8 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
tty->driver_data = serial;
serial->tty = tty;
+ /* check for port already opened, if not set the termios */
+ serial->open_count++;
if (serial->open_count == 1) {
tty->low_latency = 1;
serial->rx_state = RX_IDLE;
@@ -1288,10 +1285,6 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
u8 usb_gone;
D1("Closing serial port");
- if (serial == NULL || serial->magic != HSO_SERIAL_MAGIC) {
- D1("invalid serial structure bailing out.\n");
- return;
- }
mutex_lock(&serial->parent->mutex);
usb_gone = serial->parent->usb_gone;