diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 20:34:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 20:34:29 -0700 |
| commit | b3d9d6be035a7d1cc6740cee695301bf37caedcd (patch) | |
| tree | f4244162d7f1f55ebbe53a717a47ef81988976b2 /drivers/ata/pata_cs5536.c | |
| parent | b35e7041186a9ace341665d404274d58a32b6e2c (diff) | |
| parent | 96af154710d44b574515431a0bb014888398a741 (diff) | |
| download | kernel_samsung_smdk4412-b3d9d6be035a7d1cc6740cee695301bf37caedcd.zip kernel_samsung_smdk4412-b3d9d6be035a7d1cc6740cee695301bf37caedcd.tar.gz kernel_samsung_smdk4412-b3d9d6be035a7d1cc6740cee695301bf37caedcd.tar.bz2 | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] sata_sis: use correct S/G table size
pata_cs5536: MWDMA fix
sata_sis: fix SCR read breakage
libata: fix kernel-doc param name
Diffstat (limited to 'drivers/ata/pata_cs5536.c')
| -rw-r--r-- | drivers/ata/pata_cs5536.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c index 53070f6..d753e56 100644 --- a/drivers/ata/pata_cs5536.c +++ b/drivers/ata/pata_cs5536.c @@ -40,7 +40,7 @@ #include <asm/msr.h> #define DRV_NAME "pata_cs5536" -#define DRV_VERSION "0.0.5" +#define DRV_VERSION "0.0.6" enum { CFG = 0, @@ -214,7 +214,7 @@ static void cs5536_set_dmamode(struct ata_port *ap, struct ata_device *adev) cs5536_read(pdev, DTC, &dtc); dtc &= ~(IDE_DRV_MASK << dshift); - dtc |= mwdma_timings[mode] << dshift; + dtc |= mwdma_timings[mode - XFER_MW_DMA_0] << dshift; cs5536_write(pdev, DTC, dtc); } |