diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-04 16:14:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-04 16:14:15 -0500 |
| commit | 5da0c7aad6271dd29526e3b49cbeb3bab9e8e491 (patch) | |
| tree | ae8e3d33eb5e71a83a9420b45eca9d7499b5a97f | |
| parent | 615bb29ccbe9fa06d9f33b29d9c3f51340726656 (diff) | |
| parent | 9e66269d40229cd9823024120910a43af57a9d72 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: iso and async streams: s/g list fix
| -rw-r--r-- | drivers/ieee1394/dma.c | 3 |
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, | |||
| 103 | goto err; | 103 | goto err; |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | /* just to be safe - this will become unnecessary once sglist->address goes away */ | 106 | sg_init_table(dma->sglist, dma->n_pages); |
| 107 | memset(dma->sglist, 0, dma->n_pages * sizeof(*dma->sglist)); | ||
| 108 | 107 | ||
| 109 | /* fill scatter/gather list with pages */ | 108 | /* fill scatter/gather list with pages */ |
| 110 | for (i = 0; i < dma->n_pages; i++) { | 109 | for (i = 0; i < dma->n_pages; i++) { |