mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: stefani@seibold.net
To: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org,
	oneukum@suse.de
Cc: linux-usb@vger.kernel.org, Stefani Seibold <stefani@seibold.net>
Subject: [PATCH 07/13] fix flush function
Date: Thu,  7 Jun 2012 10:20:37 +0200	[thread overview]
Message-ID: <1339057243-10029-8-git-send-email-stefani@seibold.net> (raw)
In-Reply-To: <1339057243-10029-1-git-send-email-stefani@seibold.net>

From: Stefani Seibold <stefani@seibold.net>

- Check for disconnect
- Fix nameing of the return value

Signed-off-by: Stefani Seibold <stefani@seibold.net>
---
 drivers/usb/usb-skeleton.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index e4cb88a..dc95129 100644
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -136,21 +136,25 @@ static void skel_draw_down(struct usb_skel *dev)
 static int skel_flush(struct file *file, fl_owner_t id)
 {
 	struct usb_skel *dev = file->private_data;
-	int res;
+	int retval;
 
 	/* wait for io to stop */
 	mutex_lock(&dev->io_mutex);
+	if (!dev->interface) {		/* disconnect() was called */
+		retval = -ENODEV;
+		goto exit;
+	}
 	skel_draw_down(dev);
 
 	/* read out errors, leave subsequent opens a clean slate */
 	spin_lock_irq(&dev->err_lock);
-	res = dev->errors ? (dev->errors == -EPIPE ? -EPIPE : -EIO) : 0;
+	retval = dev->errors ? (dev->errors == -EPIPE ? -EPIPE : -EIO) : 0;
 	dev->errors = 0;
 	spin_unlock_irq(&dev->err_lock);
-
+exit:
 	mutex_unlock(&dev->io_mutex);
 
-	return res;
+	return retval;
 }
 
 static void skel_read_bulk_callback(struct urb *urb)
-- 
1.7.8.6


  parent reply	other threads:[~2012-06-07  8:21 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-07  8:20 [PATCH] fix usb skeleton driver stefani
2012-06-07  8:20 ` [PATCH 01/13] fix wrong label in skel_open stefani
2012-06-13  1:03   ` Greg KH
2012-06-07  8:20 ` [PATCH 02/13] code cleanup stefani
2012-06-07  9:06   ` Bjørn Mork
2012-06-07  9:21     ` Stefani Seibold
2012-06-07 10:49       ` Bjørn Mork
2012-06-13  1:03         ` Greg KH
2012-06-13  1:02   ` Greg KH
2012-06-13 18:00     ` Stefani Seibold
2012-06-07  8:20 ` [PATCH 03/13] remove dead code stefani
2012-06-07 15:04   ` Oliver Neukum
2012-06-07 19:40     ` Stefani Seibold
2012-06-07  8:20 ` [PATCH 04/13] remove unneeded forward declaration stefani
2012-06-07  8:20 ` [PATCH 05/13] remove pr_err() noise in skel_open stefani
2012-06-07  8:20 ` [PATCH 06/13] Handle a non blocking read without blocking stefani
2012-06-07  8:20 ` stefani [this message]
2012-06-07  8:20 ` [PATCH 08/13] add fsync function stefani
2012-06-07  8:20 ` [PATCH 09/13] remove unneeded lock in skel_open stefani
2012-06-07  8:20 ` [PATCH 10/13] fix race in skel_write stefani
2012-06-07  8:20 ` [PATCH 11/13] fix kref usage in skel_open stefani
2012-06-07  8:20 ` [PATCH 12/13] Introduce single user mode stefani
2012-06-13  1:05   ` Greg KH
2012-06-07  8:20 ` [PATCH 13/13] Bump version number and add aditional author stefani
2012-06-07  9:09   ` Bjørn Mork
2012-06-13  1:00     ` Greg KH

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=1339057243-10029-8-git-send-email-stefani@seibold.net \
    --to=stefani@seibold.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=oneukum@suse.de \
    /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®