summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/epautoconf.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-01-09 20:06:31 +0400
committerArnd Bergmann <arnd@arndb.de>2012-01-09 20:06:31 +0400
commitb48741cce3be32a48af9a2b272f3f13a077375cf (patch)
treee4bc91713e02fa6d8f08b07de53ea8f905593dfa /drivers/usb/gadget/epautoconf.c
parent54b6c82ac9a124804816f244f587c0f40d25ad01 (diff)
parenta07613a54d700a974f3a4a657da78ef5d097315d (diff)
downloadlinux-b48741cce3be32a48af9a2b272f3f13a077375cf.tar.xz
Merge branch 'samsung/cleanup' into next/cleanup2
Diffstat (limited to 'drivers/usb/gadget/epautoconf.c')
-rw-r--r--drivers/usb/gadget/epautoconf.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 596a0b464e61..4dff83d2f265 100644
--- 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;
}
}