소스 검색

usb: gadget: midi: make FS and HS available

This function works only on FS or HS. If the gadget is HS capable only
HS descriptors are assigned. If we plug it to an 1.1 host it won't work
because we have only 2.0 descriptors. This patch changes the behavior to
provide both sets.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Sebastian Andrzej Siewior 13 년 전
부모
커밋
7f2a9268b4
1개의 변경된 파일8개의 추가작업 그리고 2개의 파일을 삭제
  1. 8 2
      drivers/usb/gadget/f_midi.c

+ 8 - 2
drivers/usb/gadget/f_midi.c

@@ -882,18 +882,24 @@ f_midi_bind(struct usb_configuration *c, struct usb_function *f)
 	 * both speeds
 	 * both speeds
 	 */
 	 */
 	/* copy descriptors, and track endpoint copies */
 	/* copy descriptors, and track endpoint copies */
+	f->descriptors = usb_copy_descriptors(midi_function);
+	if (!f->descriptors)
+		goto fail_f_midi;
 	if (gadget_is_dualspeed(c->cdev->gadget)) {
 	if (gadget_is_dualspeed(c->cdev->gadget)) {
 		bulk_in_desc.wMaxPacketSize = cpu_to_le16(512);
 		bulk_in_desc.wMaxPacketSize = cpu_to_le16(512);
 		bulk_out_desc.wMaxPacketSize = cpu_to_le16(512);
 		bulk_out_desc.wMaxPacketSize = cpu_to_le16(512);
 		f->hs_descriptors = usb_copy_descriptors(midi_function);
 		f->hs_descriptors = usb_copy_descriptors(midi_function);
-	} else {
-		f->descriptors = usb_copy_descriptors(midi_function);
+		if (!f->hs_descriptors)
+			goto fail_f_midi;
 	}
 	}
 
 
 	kfree(midi_function);
 	kfree(midi_function);
 
 
 	return 0;
 	return 0;
 
 
+fail_f_midi:
+	kfree(midi_function);
+	usb_free_descriptors(f->hs_descriptors);
 fail:
 fail:
 	/* we might as well release our claims on endpoints */
 	/* we might as well release our claims on endpoints */
 	if (midi->out_ep)
 	if (midi->out_ep)