1 files changed, 6 insertions, 16 deletions

diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 4639b629e60c..8712ef987179 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -3733,19 +3733,12 @@ static void /* __init_or_exit */ fsg_unbind(struct usb_gadget *gadget)
         }
 
         /* Free the data buffers */
-        for (i = 0; i < NUM_BUFFERS; ++i) {
-                struct fsg_buffhd       *bh = &fsg->buffhds[i];
-
-                if (bh->buf)
-                        usb_ep_free_buffer(fsg->bulk_in, bh->buf, bh->dma,
-                                        mod_data.buflen);
-        }
+        for (i = 0; i < NUM_BUFFERS; ++i)
+                kfree(fsg->buffhds[i].buf);
 
         /* Free the request and buffer for endpoint 0 */
         if (req) {
-                if (req->buf)
-                        usb_ep_free_buffer(fsg->ep0, req->buf,
-                                        req->dma, EP0_BUFSIZE);
+                kfree(req->buf);
                 usb_ep_free_request(fsg->ep0, req);
         }
 
@@ -3963,8 +3956,7 @@ static int __init fsg_bind(struct usb_gadget *gadget)
 #endif
 
         if (gadget->is_otg) {
-                otg_desc.bmAttributes |= USB_OTG_HNP,
-                config_desc.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+                otg_desc.bmAttributes |= USB_OTG_HNP;
         }
 
         rc = -ENOMEM;
@@ -3973,8 +3965,7 @@ static int __init fsg_bind(struct usb_gadget *gadget)
         fsg->ep0req = req = usb_ep_alloc_request(fsg->ep0, GFP_KERNEL);
         if (!req)
                 goto out;
-        req->buf = usb_ep_alloc_buffer(fsg->ep0, EP0_BUFSIZE,
-                        &req->dma, GFP_KERNEL);
+        req->buf = kmalloc(EP0_BUFSIZE, GFP_KERNEL);
         if (!req->buf)
                 goto out;
         req->complete = ep0_complete;
@@ -3986,8 +3977,7 @@ static int __init fsg_bind(struct usb_gadget *gadget)
                 /* Allocate for the bulk-in endpoint.  We assume that
                  * the buffer will also work with the bulk-out (and
                  * interrupt-in) endpoint. */
-                bh->buf = usb_ep_alloc_buffer(fsg->bulk_in, mod_data.buflen,
-                                &bh->dma, GFP_KERNEL);
+                bh->buf = kmalloc(mod_data.buflen, GFP_KERNEL);
                 if (!bh->buf)
                         goto out;
                 bh->next = bh + 1;