diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-11 17:54:00 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-11 17:54:00 -0400 |
commit | 55f17e8da1f02ce0a36303a3f266c45045004cf5 (patch) | |
tree | 15116d738353dc99e7bf6d9f32044eedefeb1ae6 /drivers/ide/pci/amd74xx.c | |
parent | 26bcb879c03254545a19c6700fe5bcef6f21e7b1 (diff) |
amd74xx/via82cxxx: use ide_tune_dma()
* Use ide_tune_dma() in amd74xx/via82cxxx driver, this fixes following bugs:
- DMA capability bit not being checked on the device
- DMA blacklist not being checked
- DMA mode being programmed even if drive->autodma == 0
(thus possibly destroying PIO timings)
* Bump driver version.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/amd74xx.c')
-rw-r--r-- | drivers/ide/pci/amd74xx.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index 1088ba86cd1..513205e52ad 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Version 2.21 | 2 | * Version 2.22 |
3 | * | 3 | * |
4 | * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04 | 4 | * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04 |
5 | * IDE driver for Linux. | 5 | * IDE driver for Linux. |
@@ -276,18 +276,11 @@ static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
276 | 276 | ||
277 | static int amd74xx_ide_dma_check(ide_drive_t *drive) | 277 | static int amd74xx_ide_dma_check(ide_drive_t *drive) |
278 | { | 278 | { |
279 | u8 speed = ide_max_dma_mode(drive); | 279 | if (ide_tune_dma(drive)) |
280 | |||
281 | if (speed == 0) { | ||
282 | ide_set_max_pio(drive); | ||
283 | return -1; | ||
284 | } | ||
285 | |||
286 | amd_set_drive(drive, speed); | ||
287 | |||
288 | if (drive->autodma) | ||
289 | return 0; | 280 | return 0; |
290 | 281 | ||
282 | ide_set_max_pio(drive); | ||
283 | |||
291 | return -1; | 284 | return -1; |
292 | } | 285 | } |
293 | 286 | ||