Commit 5da0c7aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 615bb29c 9e66269d

drivers/ieee1394/dma.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -103,8 +103,7 @@ int dma_region_alloc(struct dma_region *dma, unsigned long n_bytes, 
		goto err;

		goto err;

	}

	}





	/* just to be safe - this will become unnecessary once sglist->address goes away */

	sg_init_table(dma->sglist, dma->n_pages);

	memset(dma->sglist, 0, dma->n_pages * sizeof(*dma->sglist));





	/* fill scatter/gather list with pages */

	/* fill scatter/gather list with pages */

	for (i = 0; i < dma->n_pages; i++) {

	for (i = 0; i < dma->n_pages; i++) {