[PATCH] ide should check dma_on

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index e4df5743e77f10ac01bde1235d7b9fbb8bb07a60..b39311feaa20ceeda95363176a0ab192ca7c3984 100644 (file)
--- 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;