From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Mon, 5 Nov 2007 20:42:30 +0000 (+0100)
Subject: ide: fix IDE_HFLAG_NO_ATAPI_DMA handling in config_drive_for_dma()
X-Git-Tag: v2.6.24-rc2~29^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bcbf6ee3eb5212ff774161cae15ce4f92f7edafb;p=~emulex%2Finfiniband.git

ide: fix IDE_HFLAG_NO_ATAPI_DMA handling in config_drive_for_dma()

commit 33c1002ed912ac9dacedd5d5b166da3b72d18460 incorrectly changed return
value from '0' to '-1', fix it (ns87415 was the only host driver affected
since it uses both IDE_HFLAG_TRUST_BIOS_FOR_DMA and IDE_HFLAG_NO_ATAPI_DMA).

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

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 202d56a8ead..e3add70b9cd 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -340,7 +340,7 @@ static int config_drive_for_dma (ide_drive_t *drive)
 
 	if (drive->media != ide_disk) {
 		if (hwif->host_flags & IDE_HFLAG_NO_ATAPI_DMA)
-			return -1;
+			return 0;
 	}
 
 	/*