Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / function / f_uac1.c

diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 7856b3394494b7d4250637277dd1f42f45d7a1ea..8ee701924d29d0c5ad27edfed1b3e23c15b5c3e7 100644 (file)
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -593,7 +593,6 @@ static int f_audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
                                return err;
 
                        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))
                                return -ENOMEM;
@@ -718,7 +717,6 @@ f_audio_bind(struct usb_configuration *c, struct usb_function *f)
                goto fail;
        audio->out_ep = ep;
        audio->out_ep->desc = &as_out_ep_desc;
-       ep->driver_data = cdev; /* claim */
 
        status = -ENOMEM;
 
@@ -730,8 +728,6 @@ f_audio_bind(struct usb_configuration *c, struct usb_function *f)
 
 fail:
        gaudio_cleanup(&audio->card);
-       if (ep)
-               ep->driver_data = NULL;
        return status;
 }