]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
icside: icside_dma_setup() fixes
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 27 Mar 2009 11:46:32 +0000 (12:46 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 27 Mar 2009 11:46:32 +0000 (12:46 +0100)
Check for ide_build_sglist() return value and re-map sg table if necessary.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/icside.c

index 0cf47e6e9793e0da31b74fb01dcb1c1b5f143ba0..cf0522f937c1c42b6a508bf2a6c1adcf753f4f97 100644 (file)
@@ -326,6 +326,10 @@ static int icside_dma_setup(ide_drive_t *drive)
        BUG_ON(dma_channel_active(ec->dma));
 
        hwif->sg_nents = ide_build_sglist(drive, rq);
+       if (hwif->sg_nents == 0) {
+               ide_map_sg(drive, rq);
+               return 1;
+       }
 
        /*
         * Ensure that we have the right interrupt routed.