From 14d04e2ce1c693cb0b2a70fad25722430d0ca334 Mon Sep 17 00:00:00 2001 From: Denis Joseph Barrow Date: Tue, 25 Nov 2008 00:27:50 -0800 Subject: [PATCH] --- yaml --- r: 122135 b: refs/heads/master c: 4a3e818181e1baf970e9232ca8b747e233176b87 h: refs/heads/master i: 122133: 425d870f66eede9279bcb4df96debc9513e1d5fc 122131: 30a9ef8c4dbf9dc6753f1bb287953cb09ee48601 122127: 6390ae4945c83476d84253f67fe18cb4652dff22 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/hso.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 12b50abbf5f5..f9beb504dbc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bab04c3adbb55aeb5e8db60522f14ce0bb0d4179 +refs/heads/master: 4a3e818181e1baf970e9232ca8b747e233176b87 diff --git a/trunk/drivers/net/usb/hso.c b/trunk/drivers/net/usb/hso.c index cee1d2a280bd..d5857321979b 100644 --- a/trunk/drivers/net/usb/hso.c +++ b/trunk/drivers/net/usb/hso.c @@ -1235,6 +1235,11 @@ 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; @@ -1246,8 +1251,6 @@ 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; @@ -1285,6 +1288,10 @@ 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;