aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/icside.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:37 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:37 -0400
commite6830a86c260d73c6f370aa7ed17ee6c71e5ee05 (patch)
treec2c7d472184da1549852b86eef551609cddcbcbf /drivers/ide/icside.c
parentb109f526cabcd098131e770fd6232282bce147b4 (diff)
ide: call ide_build_sglist() prior to ->dma_setup (v2)
* Re-map sg table if needed in ide_build_sglist(). * Move ide_build_sglist() call from ->dma_setup to its users. * Un-export ide_build_sglist(). v2: * Build fix for CONFIG_BLK_DEV_IDEDMA=n (noticed by Randy Dunlap). There should be no functional changes caused by this patch. Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/icside.c')
-rw-r--r--drivers/ide/icside.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index cf0522f937c1..78fc36f98d29 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -325,12 +325,6 @@ static int icside_dma_setup(ide_drive_t *drive)
325 */ 325 */
326 BUG_ON(dma_channel_active(ec->dma)); 326 BUG_ON(dma_channel_active(ec->dma));
327 327
328 hwif->sg_nents = ide_build_sglist(drive, rq);
329 if (hwif->sg_nents == 0) {
330 ide_map_sg(drive, rq);
331 return 1;
332 }
333
334 /* 328 /*
335 * Ensure that we have the right interrupt routed. 329 * Ensure that we have the right interrupt routed.
336 */ 330 */