[PATCH] pata_marvell: merge Mandriva patches

Correct and complete the Marvell PATA cable detection logic.

From: Arnaud Patard <[email protected]>
Signed-off-by: Arnaud Patard <[email protected]>
Signed-off-by: Alan Cox <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>

diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index a5953c389264e6ea9e952e8956652e73221caa85..25f7a79a8e251aa96d309f832baa2e6c47283b50 100644 (file)
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -57,11 +57,11 @@ static int marvell_pre_reset(struct ata_port *ap)
        switch(ap->port_no)
        {
        case 0:
-               /* Might be backward, docs unclear */
                if (inb(ap->ioaddr.bmdma_addr + 1) & 1)
-                       ap->cbl = ATA_CBL_PATA80;
-               else
                        ap->cbl = ATA_CBL_PATA40;
+               else
+                       ap->cbl = ATA_CBL_PATA80;
+               break;
 
        case 1: /* Legacy SATA port */
                ap->cbl = ATA_CBL_SATA;