diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 19:56:47 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 19:56:47 +0100 |
| commit | 99ffbe0e9713c89798c90bde7a462645e098b76b (patch) | |
| tree | 08e09cca2575d46087fc160c7253d4740e7a988c | |
| parent | af10f77390f6c7c5cf6f53e6b3cdaa38562b03af (diff) | |
| download | linux-99ffbe0e9713c89798c90bde7a462645e098b76b.tar.bz2 | |
ide: move drive->crc_count check out from check_dma_crc()
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| -rw-r--r-- | drivers/ide/ide-iops.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index e00fbbb423bf..955bac2166a2 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c @@ -968,13 +968,10 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive) static void check_dma_crc(ide_drive_t *drive) { #ifdef CONFIG_BLK_DEV_IDEDMA - if (drive->crc_count) { - ide_dma_off_quietly(drive); - ide_set_xfer_rate(drive, ide_auto_reduce_xfer(drive)); - if (drive->current_speed >= XFER_SW_DMA_0) - ide_dma_on(drive); - } else - ide_dma_off(drive); + ide_dma_off_quietly(drive); + ide_set_xfer_rate(drive, ide_auto_reduce_xfer(drive)); + if (drive->current_speed >= XFER_SW_DMA_0) + ide_dma_on(drive); #endif } @@ -999,17 +996,20 @@ static void pre_reset(ide_drive_t *drive) else drive->post_reset = 1; - if (!drive->keep_settings) { - if (drive->using_dma) { + if (drive->using_dma) { + if (drive->crc_count) check_dma_crc(drive); - } else { + else + ide_dma_off(drive); + } + + if (!drive->keep_settings) { + if (!drive->using_dma) { drive->unmask = 0; drive->io_32bit = 0; } return; } - if (drive->using_dma) - check_dma_crc(drive); if (HWIF(drive)->pre_reset != NULL) HWIF(drive)->pre_reset(drive); |