From eabec152200be6401b529e29a1560be1673b3827 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 5 May 2007 22:03:50 +0200 Subject: [PATCH] --- yaml --- r: 53602 b: refs/heads/master c: 072cdcbb7af8a0e1894f9caa6d46d027bbe7f647 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/pci/alim15x3.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b414f7818e63..0ac01cbd3788 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 826a1b6502d0d1d67fc41043fc831e90f2ef5835 +refs/heads/master: 072cdcbb7af8a0e1894f9caa6d46d027bbe7f647 diff --git a/trunk/drivers/ide/pci/alim15x3.c b/trunk/drivers/ide/pci/alim15x3.c index 83e0aa65a431..946a12746cb5 100644 --- a/trunk/drivers/ide/pci/alim15x3.c +++ b/trunk/drivers/ide/pci/alim15x3.c @@ -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 @@ static int ali15x3_config_drive_for_dma(ide_drive_t *drive) (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; }