summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-11-04 09:44:56 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-11-04 14:31:16 +0100
commit9e66269d40229cd9823024120910a43af57a9d72 (patch)
tree58d34526f660d8c25504ff9c7393a3be69df5338
parentb4f555081fdd27d13e6ff39d455d5aefae9d2c0c (diff)
downloadlinux-stable-9e66269d40229cd9823024120910a43af57a9d72.tar.gz
linux-stable-9e66269d40229cd9823024120910a43af57a9d72.tar.bz2
linux-stable-9e66269d40229cd9823024120910a43af57a9d72.zip
ieee1394: iso and async streams: s/g list fix
Torsten Kaiser wrote: > Looking that calltrace upwards, it seems replacing the > memset(dma->sglist,...) with sg_init_table(...) would fix the BUG_ON() > as that inits the SG_MAGIC. Tested-by: Torsten Kaiser <just.for.lkml@googlemail.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--drivers/ieee1394/dma.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ieee1394/dma.c b/drivers/ieee1394/dma.c
index f5f4983dfbf3..7c4eb39b7024 100644
--- a/drivers/ieee1394/dma.c
+++ b/drivers/ieee1394/dma.c
@@ -103,8 +103,7 @@ int dma_region_alloc(struct dma_region *dma, unsigned long n_bytes,
goto err;
}
- /* just to be safe - this will become unnecessary once sglist->address goes away */
- memset(dma->sglist, 0, dma->n_pages * sizeof(*dma->sglist));
+ sg_init_table(dma->sglist, dma->n_pages);
/* fill scatter/gather list with pages */
for (i = 0; i < dma->n_pages; i++) {