mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Johan Hovold <jhovold@gmail.com>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
	Johan Hovold <jhovold@gmail.com>
Subject: [PATCH 8/9] USB: serial: clear fifo on close
Date: Wed, 17 Mar 2010 23:00:44 +0100	[thread overview]
Message-ID: <1268863245-17230-9-git-send-email-jhovold@gmail.com> (raw)
In-Reply-To: <1268863245-17230-1-git-send-email-jhovold@gmail.com>

Make sure fifo is emptied on close.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
 drivers/usb/serial/generic.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index d3ef69f..e0c7d53 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -155,13 +155,19 @@ EXPORT_SYMBOL_GPL(usb_serial_generic_open);
 static void generic_cleanup(struct usb_serial_port *port)
 {
 	struct usb_serial *serial = port->serial;
+	unsigned long flags;
 
 	dbg("%s - port %d", __func__, port->number);
 
 	if (serial->dev) {
 		/* shutdown any bulk transfers that might be going on */
-		if (port->bulk_out_size)
+		if (port->bulk_out_size) {
 			usb_kill_urb(port->write_urb);
+
+			spin_lock_irqsave(&port->lock, flags);
+			kfifo_reset_out(&port->write_fifo);
+			spin_unlock_irqrestore(&port->lock, flags);
+		}
 		if (port->bulk_in_size)
 			usb_kill_urb(port->read_urb);
 	}
-- 
1.7.0.2


  parent reply	other threads:[~2010-03-17 22:07 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-17 22:00 [PATCH 0/9] USB: serial: generic driver fixes and bulk buffer feature Johan Hovold
2010-03-17 22:00 ` [PATCH 1/9] USB: serial: allow drivers to define bulk buffer sizes Johan Hovold
2010-03-17 22:00 ` [PATCH 2/9] USB: cp210x: increase the bulk-out buffer size to 256 byte Johan Hovold
2010-03-17 22:00 ` [PATCH 3/9] USB: cp210x: increase bulk-in " Johan Hovold
2010-03-17 22:00 ` [PATCH 4/9] USB: pl2303: increase the bulk-out " Johan Hovold
2010-03-17 22:00 ` [PATCH 5/9] USB: pl2303: increase bulk-in " Johan Hovold
2010-03-17 22:00 ` [PATCH 6/9] USB: serial: fix generic chars_in_buffer Johan Hovold
2010-03-17 22:00 ` [PATCH 7/9] USB: serial: fix missing locking on fifo in write callback Johan Hovold
2010-03-17 22:00 ` Johan Hovold [this message]
2010-03-17 22:00 ` [PATCH 9/9] USB: serial: refactor generic close Johan Hovold

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1268863245-17230-9-git-send-email-jhovold@gmail.com \
    --to=jhovold@gmail.com \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®