diff options
Diffstat (limited to 'drivers/ide/cris/ide-cris.c')
-rw-r--r-- | drivers/ide/cris/ide-cris.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c index 5797e0b5a132..7afb715b86e5 100644 --- a/drivers/ide/cris/ide-cris.c +++ b/drivers/ide/cris/ide-cris.c | |||
@@ -821,6 +821,9 @@ init_e100_ide (void) | |||
821 | hwif->ultra_mask = cris_ultra_mask; | 821 | hwif->ultra_mask = cris_ultra_mask; |
822 | hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */ | 822 | hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */ |
823 | hwif->swdma_mask = 0x07; /* Singleword DMA 0-2 */ | 823 | hwif->swdma_mask = 0x07; /* Singleword DMA 0-2 */ |
824 | hwif->autodma = 1; | ||
825 | hwif->drives[0].autodma = 1; | ||
826 | hwif->drives[1].autodma = 1; | ||
824 | } | 827 | } |
825 | 828 | ||
826 | /* Reset pulse */ | 829 | /* Reset pulse */ |
@@ -1046,14 +1049,9 @@ static ide_startstop_t cris_dma_intr (ide_drive_t *drive) | |||
1046 | static int cris_dma_check(ide_drive_t *drive) | 1049 | static int cris_dma_check(ide_drive_t *drive) |
1047 | { | 1050 | { |
1048 | ide_hwif_t *hwif = drive->hwif; | 1051 | ide_hwif_t *hwif = drive->hwif; |
1049 | struct hd_driveid* id = drive->id; | ||
1050 | 1052 | ||
1051 | if (id && (id->capability & 1)) { | 1053 | if (ide_use_dma(drive) && cris_config_drive_for_dma(drive)) |
1052 | if (ide_use_dma(drive)) { | 1054 | return hwif->ide_dma_on(drive); |
1053 | if (cris_config_drive_for_dma(drive)) | ||
1054 | return hwif->ide_dma_on(drive); | ||
1055 | } | ||
1056 | } | ||
1057 | 1055 | ||
1058 | return hwif->ide_dma_off_quietly(drive); | 1056 | return hwif->ide_dma_off_quietly(drive); |
1059 | } | 1057 | } |