diff options
Diffstat (limited to 'drivers/ide/pci/alim15x3.c')
-rw-r--r-- | drivers/ide/pci/alim15x3.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 2baed4e04beb..4debd18d52f8 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
@@ -507,17 +507,15 @@ static int config_chipset_for_dma (ide_drive_t *drive) | |||
507 | * | 507 | * |
508 | * Configure a drive for DMA operation. If DMA is not possible we | 508 | * Configure a drive for DMA operation. If DMA is not possible we |
509 | * drop the drive into PIO mode instead. | 509 | * drop the drive into PIO mode instead. |
510 | * | ||
511 | * FIXME: exactly what are we trying to return here | ||
512 | */ | 510 | */ |
513 | 511 | ||
514 | static int ali15x3_config_drive_for_dma(ide_drive_t *drive) | 512 | static int ali15x3_config_drive_for_dma(ide_drive_t *drive) |
515 | { | 513 | { |
516 | ide_hwif_t *hwif = HWIF(drive); | 514 | ide_hwif_t *hwif = HWIF(drive); |
517 | struct hd_driveid *id = drive->id; | 515 | struct hd_driveid *id = drive->id; |
518 | 516 | ||
519 | if ((m5229_revision<=0x20) && (drive->media!=ide_disk)) | 517 | if ((m5229_revision<=0x20) && (drive->media!=ide_disk)) |
520 | return hwif->ide_dma_off_quietly(drive); | 518 | goto no_dma_set; |
521 | 519 | ||
522 | drive->init_speed = 0; | 520 | drive->init_speed = 0; |
523 | 521 | ||
@@ -552,9 +550,10 @@ try_dma_modes: | |||
552 | ata_pio: | 550 | ata_pio: |
553 | hwif->tuneproc(drive, 255); | 551 | hwif->tuneproc(drive, 255); |
554 | no_dma_set: | 552 | no_dma_set: |
555 | return hwif->ide_dma_off_quietly(drive); | 553 | return -1; |
556 | } | 554 | } |
557 | return hwif->ide_dma_on(drive); | 555 | |
556 | return 0; | ||
558 | } | 557 | } |
559 | 558 | ||
560 | /** | 559 | /** |