From d42d4de12d8673bf187d24bdd426671214595a00 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Fri, 26 Aug 2011 12:48:15 +0300 Subject: [PATCH] --- yaml --- r: 264997 b: refs/heads/master c: ef7f584ce7b40bcfc108477d2711270379ca8596 h: refs/heads/master i: 264995: 911ba951eae9d369a34428a8766c5be3fead8b90 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/f_audio.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9d8503f033f8..ef7ca9ac00f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6532c7fdb2c3a2ec1b949ecd2ff5375069c1639a +refs/heads/master: ef7f584ce7b40bcfc108477d2711270379ca8596 diff --git a/trunk/drivers/usb/gadget/f_audio.c b/trunk/drivers/usb/gadget/f_audio.c index a9a4eade7e80..ddeaa45cd886 100644 --- a/trunk/drivers/usb/gadget/f_audio.c +++ b/trunk/drivers/usb/gadget/f_audio.c @@ -681,17 +681,18 @@ f_audio_bind(struct usb_configuration *c, struct usb_function *f) status = -ENOMEM; - /* supcard all relevant hardware speeds... we expect that when + /* copy descriptors, and track endpoint copies */ + f->descriptors = usb_copy_descriptors(f_audio_desc); + + /* + * support all relevant hardware speeds... we expect that when * hardware is dual speed, all bulk-capable endpoints work at * both speeds */ - - /* copy descriptors, and track endpoint copies */ if (gadget_is_dualspeed(c->cdev->gadget)) { c->highspeed = true; f->hs_descriptors = usb_copy_descriptors(f_audio_desc); - } else - f->descriptors = usb_copy_descriptors(f_audio_desc); + } return 0;