From 4b0963f5b6de13aac4673d3cd15e2c6e8c331c4b Mon Sep 17 00:00:00 2001 From: Jan Dumon Date: Tue, 5 Jan 2010 04:51:28 +0000 Subject: [PATCH] --- yaml --- r: 179097 b: refs/heads/master c: f4763e96c08ea0790750603999e5b3158c3b50d4 h: refs/heads/master i: 179095: bd5711dd283953de28fc6187827c36e4d9107880 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/hso.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index be52f54a7a5a..37676091e9b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9ced80d1084758772d350ac66b1ad0eeefc7f95 +refs/heads/master: f4763e96c08ea0790750603999e5b3158c3b50d4 diff --git a/trunk/drivers/net/usb/hso.c b/trunk/drivers/net/usb/hso.c index aba90e77e077..fb1c5ac55c01 100644 --- a/trunk/drivers/net/usb/hso.c +++ b/trunk/drivers/net/usb/hso.c @@ -1915,18 +1915,18 @@ static void intr_callback(struct urb *urb) if (serial != NULL) { D1("Pending read interrupt on port %d\n", i); spin_lock(&serial->serial_lock); - if (serial->rx_state == RX_IDLE) { + if (serial->rx_state == RX_IDLE && + serial->open_count > 0) { /* Setup and send a ctrl req read on * port i */ - if (!serial->rx_urb_filled[0]) { + if (!serial->rx_urb_filled[0]) { serial->rx_state = RX_SENT; hso_mux_serial_read(serial); } else serial->rx_state = RX_PENDING; - } else { - D1("Already pending a read on " - "port %d\n", i); + D1("Already a read pending on " + "port %d or port not open\n", i); } spin_unlock(&serial->serial_lock); }