summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-10-22 22:15:01 +0200
committerFelipe Balbi <balbi@ti.com>2012-10-31 15:05:00 +0200
commit1377af2f756f3b5de2850ec0a5edebf227798d02 (patch)
tree50be4506b46fad8d5613482580ab69064ccb78e9
parente79cc615a9bb44da72c499ccfa2c9c4bbea3aa84 (diff)
downloadop-kernel-dev-1377af2f756f3b5de2850ec0a5edebf227798d02.zip
op-kernel-dev-1377af2f756f3b5de2850ec0a5edebf227798d02.tar.gz
usb: gadget: audio: remove c->highpseed = true from f_midi and uac1
Whether highspeed configuration is valid or not is something that composite decides and not the gadget. That gadget can only provide the required descriptors for it. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/gadget/f_midi.c1
-rw-r--r--drivers/usb/gadget/f_uac1.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_midi.c b/drivers/usb/gadget/f_midi.c
index 8ed1259..b2522ba 100644
--- a/drivers/usb/gadget/f_midi.c
+++ b/drivers/usb/gadget/f_midi.c
@@ -882,7 +882,6 @@ f_midi_bind(struct usb_configuration *c, struct usb_function *f)
*/
/* copy descriptors, and track endpoint copies */
if (gadget_is_dualspeed(c->cdev->gadget)) {
- c->highspeed = true;
bulk_in_desc.wMaxPacketSize = cpu_to_le16(512);
bulk_out_desc.wMaxPacketSize = cpu_to_le16(512);
f->hs_descriptors = usb_copy_descriptors(midi_function);
diff --git a/drivers/usb/gadget/f_uac1.c b/drivers/usb/gadget/f_uac1.c
index 1a5dcd5..c8ed41b 100644
--- a/drivers/usb/gadget/f_uac1.c
+++ b/drivers/usb/gadget/f_uac1.c
@@ -667,7 +667,6 @@ f_audio_bind(struct usb_configuration *c, struct usb_function *f)
* both speeds
*/
if (gadget_is_dualspeed(c->cdev->gadget)) {
- c->highspeed = true;
f->hs_descriptors = usb_copy_descriptors(f_audio_desc);
}
OpenPOWER on IntegriCloud