The patch titled
g_file_storage: fix bug in DMA buffer handling
has been removed from the -mm tree. Its filename was
g_file_storage-fix-bug-in-dma-buffer-handling.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: g_file_storage: fix bug in DMA buffer handling
From: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/usb/gadget/file_storage.c | 3 ---
1 files changed, 3 deletions(-)
diff -puN drivers/usb/gadget/file_storage.c~g_file_storage-fix-bug-in-dma-buffer-handling drivers/usb/gadget/file_storage.c
--- a/drivers/usb/gadget/file_storage.c~g_file_storage-fix-bug-in-dma-buffer-handling
+++ a/drivers/usb/gadget/file_storage.c
@@ -576,7 +576,6 @@ enum fsg_buffer_state {
struct fsg_buffhd {
void *buf;
- dma_addr_t dma;
enum fsg_buffer_state state;
struct fsg_buffhd *next;
@@ -2570,7 +2569,6 @@ static int send_status(struct fsg_dev *f
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);
@@ -3163,7 +3161,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;
_
Patches currently in -mm which might be from stern@xxxxxxxxxxxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
