From: Stefani Seibold <stefani@xxxxxxxxxxx>
- Check for disconnect
- Fix nameing of the return value
Signed-off-by: Stefani Seibold <stefani@xxxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
