From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 27 Mar 2009 11:46:32 +0000 (+0100)
Subject: icside: icside_dma_setup() fixes
X-Git-Tag: v2.6.30-rc1~623^2~39
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=f7ef12482b17a015906cf74afe655e691b5fa2cb;p=safe%2Fjmp%2Flinux-2.6

icside: icside_dma_setup() fixes

Check for ide_build_sglist() return value and re-map sg table if necessary.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 0cf47e6..cf0522f 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -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.