From c7e3b59cbff39c77ce98aed8198fb94e33ec0840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Kaijanm=C3=A4ki?= Date: Mon, 23 Nov 2009 10:54:47 -0800 Subject: [PATCH] --- yaml --- r: 168956 b: refs/heads/master c: dcfcb256cc23c4436691b0fe677275306699d6a1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/hso.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f05c2a0dfa15..d6979371d425 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ce673d5e919966efc1ef5adf20248e6ecc62724 +refs/heads/master: dcfcb256cc23c4436691b0fe677275306699d6a1 diff --git a/trunk/drivers/net/usb/hso.c b/trunk/drivers/net/usb/hso.c index 746839bb89ff..43bc3fcc0d85 100644 --- a/trunk/drivers/net/usb/hso.c +++ b/trunk/drivers/net/usb/hso.c @@ -1363,7 +1363,7 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp) /* reset the rts and dtr */ /* do the actual close */ serial->open_count--; - kref_put(&serial->parent->ref, hso_serial_ref_free); + if (serial->open_count <= 0) { serial->open_count = 0; spin_lock_irq(&serial->serial_lock); @@ -1383,6 +1383,8 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp) usb_autopm_put_interface(serial->parent->interface); mutex_unlock(&serial->parent->mutex); + + kref_put(&serial->parent->ref, hso_serial_ref_free); } /* close the requested serial port */