[PATCH] ide should check dma_on

54f8af28 · Alan Cox · Linus Torvalds · 261ff2d6 · 54f8af28
Commit 54f8af28 authored Mar 21, 2003 by Alan Cox Committed by Linus Torvalds Mar 21, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/ide/ide.c drivers/ide/ide.c +2 -1

No files found.
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1255,13 +1255,14 @@ static int set_io_32bit(ide_drive_t *drive, int arg)
 static int set_using_dma (ide_drive_t *drive, int arg)
 {
-	if (!drive->driver || !DRIVER(drive)->supports_dma)
+	if (!DRIVER(drive)->supports_dma)
 		return -EPERM;
 	if (!drive->id || !(drive->id->capability & 1))
 		return -EPERM;
 	if (HWIF(drive)->ide_dma_check == NULL)
 		return -EPERM;
 	if (arg) {
+		if (HWIF(drive)->ide_dma_check(drive)) return -EIO;
 		if (HWIF(drive)->ide_dma_on(drive)) return -EIO;
 	} else {
 		if (HWIF(drive)->ide_dma_off(drive)) return -EIO;