From 3f019eea9ccff0e81d3226759a619ceec26e2e00 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 16 Oct 2007 22:29:54 +0200 Subject: [PATCH] cs5530/sc1200: add PIO autotune fallback to ->ide_dma_check * Add PIO autotune fallback to ->ide_dma_check. Since cs5530/sc1200 allow separate PIO and DMA timings, and cs5530/sc1200 always set ->autotune this change shouldn't have any other effect than bringing these drivers in-line with other host drivers wrt ->ide_dma_check implementations. * Fix ->ide_dma_check to return "-1" if DMA cannot be set. * Bump driver version. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/pci/cs5530.c | 6 ++++-- drivers/ide/pci/sc1200.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c index c972eb9bd457..1c82cd51f6d5 100644 --- a/drivers/ide/pci/cs5530.c +++ b/drivers/ide/pci/cs5530.c @@ -1,5 +1,5 @@ /* - * linux/drivers/ide/pci/cs5530.c Version 0.75 Aug 2 2007 + * linux/drivers/ide/pci/cs5530.c Version 0.76 Aug 3 2007 * * Copyright (C) 2000 Andre Hedrick * Copyright (C) 2000 Mark Lord @@ -117,7 +117,9 @@ static int cs5530_config_dma(ide_drive_t *drive) if (ide_tune_dma(drive)) return 0; - return 1; + ide_set_max_pio(drive); + + return -1; } static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode) diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 0a5669adaf51..184249ed125b 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c @@ -1,5 +1,5 @@ /* - * linux/drivers/ide/pci/sc1200.c Version 0.96 Aug 2 2007 + * linux/drivers/ide/pci/sc1200.c Version 0.97 Aug 3 2007 * * Copyright (C) 2000-2002 Mark Lord * Copyright (C) 2007 Bartlomiej Zolnierkiewicz @@ -208,7 +208,9 @@ static int sc1200_config_dma (ide_drive_t *drive) if (ide_tune_dma(drive)) return 0; - return 1; + ide_set_max_pio(drive); + + return -1; } -- 2.20.1