alim15x3: PIO fallback fix
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 5 May 2007 20:03:50 +0000 (22:03 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 5 May 2007 20:03:50 +0000 (22:03 +0200)
If DMA tuning fails always set the best PIO mode.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/pci/alim15x3.c

index 83e0aa65a4316e8c6b74f4d35373dc8b0f0c3a7c..946a12746cb5deaf45aca4abdb609368a99c9c1e 100644 (file)
@@ -534,7 +534,7 @@ static int ali15x3_config_drive_for_dma(ide_drive_t *drive)
        struct hd_driveid *id   = drive->id;
 
        if ((m5229_revision<=0x20) && (drive->media!=ide_disk))
-               goto no_dma_set;
+               goto ata_pio;
 
        drive->init_speed = 0;
 
@@ -555,20 +555,19 @@ try_dma_modes:
                            (id->dma_1word & hwif->swdma_mask)) {
                                /* Force if Capable regular DMA modes */
                                if (!config_chipset_for_dma(drive))
-                                       goto no_dma_set;
+                                       goto ata_pio;
                        }
                } else if (__ide_dma_good_drive(drive) &&
                           (id->eide_dma_time < 150)) {
                        /* Consult the list of known "good" drives */
                        if (!config_chipset_for_dma(drive))
-                               goto no_dma_set;
+                               goto ata_pio;
                } else {
                        goto ata_pio;
                }
        } else {
 ata_pio:
                hwif->tuneproc(drive, 255);
-no_dma_set:
                return -1;
        }