usb: gadget: add usb_endpoint_descriptor to struct usb_ep

[deliverable/linux.git] / drivers / usb / gadget / f_audio.c

diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c
index 8ee330a2ab58249192bcfe03b137392615400db0..02a02700b51d73b1891cb6fe2480158ef89f4799 100644 (file)
--- a/drivers/usb/gadget/f_audio.c
+++ b/drivers/usb/gadget/f_audio.c
@@ -279,7 +279,6 @@ struct f_audio {
 
        /* endpoints handle full and/or high speeds */
        struct usb_ep                   *out_ep;
-       struct usb_endpoint_descriptor  *out_desc;
 
        spinlock_t                      lock;
        struct f_audio_buf *copy_buf;
@@ -575,7 +574,7 @@ static int f_audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 
        if (intf == 1) {
                if (alt == 1) {
-                       usb_ep_enable(out_ep, audio->out_desc);
+                       usb_ep_enable(out_ep);
                        out_ep->driver_data = audio;
                        audio->copy_buf = f_audio_buffer_alloc(audio_buf_size);
                        if (IS_ERR(audio->copy_buf))
@@ -677,6 +676,7 @@ f_audio_bind(struct usb_configuration *c, struct usb_function *f)
        if (!ep)
                goto fail;
        audio->out_ep = ep;
+       audio->out_ep->desc = &as_out_ep_desc;
        ep->driver_data = cdev; /* claim */
 
        status = -ENOMEM;
@@ -776,7 +776,6 @@ int __init audio_bind_config(struct usb_configuration *c)
        audio->card.func.set_alt = f_audio_set_alt;
        audio->card.func.setup = f_audio_setup;
        audio->card.func.disable = f_audio_disable;
-       audio->out_desc = &as_out_ep_desc;
 
        control_selector_init(audio);