git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
usb
/
gadget
/
epautoconf.c
diff --git
a/drivers/usb/gadget/epautoconf.c
b/drivers/usb/gadget/epautoconf.c
index
596a0b4
..
4dff83d
100644
(file)
--- a/
drivers/usb/gadget/epautoconf.c
+++ b/
drivers/usb/gadget/epautoconf.c
@@
-130,9
+130,6
@@
ep_matches (
num_req_streams = ep_comp->bmAttributes & 0x1f;
if (num_req_streams > ep->max_streams)
return 0;
- /* Update the ep_comp descriptor if needed */
- if (num_req_streams != ep->max_streams)
- ep_comp->bmAttributes = ep->max_streams;
}
}