projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
gadget
/
f_loopback.c
diff --git
a/drivers/usb/gadget/f_loopback.c
b/drivers/usb/gadget/f_loopback.c
index 6d87f288df4eca0625dc6dccf28c151f2f268991..2c0cd824c667488bb1c0e5b9fb5375f9086eae38 100644
(file)
--- a/
drivers/usb/gadget/f_loopback.c
+++ b/
drivers/usb/gadget/f_loopback.c
@@
-418,7
+418,7
@@
int __init loopback_add(struct usb_composite_dev *cdev, bool autoresume)
/* support autoresume for remote wakeup testing */
if (autoresume)
-
sourcesin
k_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+
loopbac
k_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
/* support OTG systems */
if (gadget_is_otg(cdev->gadget)) {