|
@@ -159,10 +159,11 @@ static int skel_flush(struct file *file, fl_owner_t id)
|
|
|
static void skel_read_bulk_callback(struct urb *urb)
|
|
|
{
|
|
|
struct usb_skel *dev;
|
|
|
+ unsigned long flags;
|
|
|
|
|
|
dev = urb->context;
|
|
|
|
|
|
- spin_lock(&dev->err_lock);
|
|
|
+ spin_lock_irqsave(&dev->err_lock, flags);
|
|
|
/* sync/async unlink faults aren't errors */
|
|
|
if (urb->status) {
|
|
|
if (!(urb->status == -ENOENT ||
|
|
@@ -177,7 +178,7 @@ static void skel_read_bulk_callback(struct urb *urb)
|
|
|
dev->bulk_in_filled = urb->actual_length;
|
|
|
}
|
|
|
dev->ongoing_read = 0;
|
|
|
- spin_unlock(&dev->err_lock);
|
|
|
+ spin_unlock_irqrestore(&dev->err_lock, flags);
|
|
|
|
|
|
wake_up_interruptible(&dev->bulk_in_wait);
|
|
|
}
|
|
@@ -331,6 +332,7 @@ exit:
|
|
|
static void skel_write_bulk_callback(struct urb *urb)
|
|
|
{
|
|
|
struct usb_skel *dev;
|
|
|
+ unsigned long flags;
|
|
|
|
|
|
dev = urb->context;
|
|
|
|
|
@@ -343,9 +345,9 @@ static void skel_write_bulk_callback(struct urb *urb)
|
|
|
"%s - nonzero write bulk status received: %d\n",
|
|
|
__func__, urb->status);
|
|
|
|
|
|
- spin_lock(&dev->err_lock);
|
|
|
+ spin_lock_irqsave(&dev->err_lock, flags);
|
|
|
dev->errors = urb->status;
|
|
|
- spin_unlock(&dev->err_lock);
|
|
|
+ spin_unlock_irqrestore(&dev->err_lock, flags);
|
|
|
}
|
|
|
|
|
|
/* free up our allocated buffer */
|