diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-10-22 16:15:01 -0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-10-31 09:05:00 -0400 |
| commit | 1377af2f756f3b5de2850ec0a5edebf227798d02 (patch) | |
| tree | 50be4506b46fad8d5613482580ab69064ccb78e9 | |
| parent | e79cc615a9bb44da72c499ccfa2c9c4bbea3aa84 (diff) | |
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.c | 1 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_uac1.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_midi.c b/drivers/usb/gadget/f_midi.c index 8ed1259fe80d..b2522ba36912 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) | |||
| 882 | */ | 882 | */ |
| 883 | /* copy descriptors, and track endpoint copies */ | 883 | /* copy descriptors, and track endpoint copies */ |
| 884 | if (gadget_is_dualspeed(c->cdev->gadget)) { | 884 | if (gadget_is_dualspeed(c->cdev->gadget)) { |
| 885 | c->highspeed = true; | ||
| 886 | bulk_in_desc.wMaxPacketSize = cpu_to_le16(512); | 885 | bulk_in_desc.wMaxPacketSize = cpu_to_le16(512); |
| 887 | bulk_out_desc.wMaxPacketSize = cpu_to_le16(512); | 886 | bulk_out_desc.wMaxPacketSize = cpu_to_le16(512); |
| 888 | f->hs_descriptors = usb_copy_descriptors(midi_function); | 887 | 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 1a5dcd5565e3..c8ed41ba1042 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) | |||
| 667 | * both speeds | 667 | * both speeds |
| 668 | */ | 668 | */ |
| 669 | if (gadget_is_dualspeed(c->cdev->gadget)) { | 669 | if (gadget_is_dualspeed(c->cdev->gadget)) { |
| 670 | c->highspeed = true; | ||
| 671 | f->hs_descriptors = usb_copy_descriptors(f_audio_desc); | 670 | f->hs_descriptors = usb_copy_descriptors(f_audio_desc); |
| 672 | } | 671 | } |
| 673 | 672 | ||
