diff options
Diffstat (limited to 'drivers/usb/core/devio.c')
-rw-r--r-- | drivers/usb/core/devio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index ebe27595c4af..318bb3b96687 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c | |||
@@ -210,7 +210,7 @@ static void usbdev_vm_close(struct vm_area_struct *vma) | |||
210 | dec_usb_memory_use_count(usbm, &usbm->vma_use_count); | 210 | dec_usb_memory_use_count(usbm, &usbm->vma_use_count); |
211 | } | 211 | } |
212 | 212 | ||
213 | static struct vm_operations_struct usbdev_vm_ops = { | 213 | static const struct vm_operations_struct usbdev_vm_ops = { |
214 | .open = usbdev_vm_open, | 214 | .open = usbdev_vm_open, |
215 | .close = usbdev_vm_close | 215 | .close = usbdev_vm_close |
216 | }; | 216 | }; |
@@ -623,6 +623,8 @@ static void async_completed(struct urb *urb) | |||
623 | if (as->status < 0 && as->bulk_addr && as->status != -ECONNRESET && | 623 | if (as->status < 0 && as->bulk_addr && as->status != -ECONNRESET && |
624 | as->status != -ENOENT) | 624 | as->status != -ENOENT) |
625 | cancel_bulk_urbs(ps, as->bulk_addr); | 625 | cancel_bulk_urbs(ps, as->bulk_addr); |
626 | |||
627 | wake_up(&ps->wait); | ||
626 | spin_unlock(&ps->lock); | 628 | spin_unlock(&ps->lock); |
627 | 629 | ||
628 | if (signr) { | 630 | if (signr) { |
@@ -630,8 +632,6 @@ static void async_completed(struct urb *urb) | |||
630 | put_pid(pid); | 632 | put_pid(pid); |
631 | put_cred(cred); | 633 | put_cred(cred); |
632 | } | 634 | } |
633 | |||
634 | wake_up(&ps->wait); | ||
635 | } | 635 | } |
636 | 636 | ||
637 | static void destroy_async(struct usb_dev_state *ps, struct list_head *list) | 637 | static void destroy_async(struct usb_dev_state *ps, struct list_head *list) |