USB: g_file_storage: fix bug in DMA buffer handling

This patch (as963) fixes a recently-introduced bug.  The gadget
conversion removing DMA-mapped buffer allocation did not remove quite
enough code from the g_file_storage driver; DMA pointers were being
set to 0.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 0 insertions, 3 deletions

diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 01ddb6d3e51b..965ad7bec7b7 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -599,7 +599,6 @@ enum fsg_buffer_state {
 
 struct fsg_buffhd {
         void                            *buf;
-        dma_addr_t                      dma;
         enum fsg_buffer_state           state;
         struct fsg_buffhd               *next;
 
@@ -2612,7 +2611,6 @@ static int send_status(struct fsg_dev *fsg)
 
                 fsg->intr_buffhd = bh;          // Point to the right buffhd
                 fsg->intreq->buf = bh->inreq->buf;
-                fsg->intreq->dma = bh->inreq->dma;
                 fsg->intreq->context = bh;
                 start_transfer(fsg, fsg->intr_in, fsg->intreq,
                                 &fsg->intreq_busy, &bh->state);
@@ -3201,7 +3199,6 @@ reset:
                 if ((rc = alloc_request(fsg, fsg->bulk_out, &bh->outreq)) != 0)
                         goto reset;
                 bh->inreq->buf = bh->outreq->buf = bh->buf;
-                bh->inreq->dma = bh->outreq->dma = bh->dma;
                 bh->inreq->context = bh->outreq->context = bh;
                 bh->inreq->complete = bulk_in_complete;
                 bh->outreq->complete = bulk_out_complete;