Skip to contentSkip to conversation

pata_marvell: merge Mandriva patches

PATCH New Alan 1 participant 1 message Nov 27, 2006 libata

lore
Share & tools
lore

Alan

author
#0 lore raw

PATCH 1/1 pata_marvell: merge Mandriva patches

Correct and complete the Marvell PATA cable detection logic.

From: Arnaud Patard <[email protected]>

drivers/ata/pata_marvell.c +3 -3
diff -u --exclude-from /usr/src/exclude --new-file --recursive linux.vanilla-2.6.19-rc6-mm1/drivers/ata/pata_marvell.c linux-2.6.19-rc6-mm1/drivers/ata/pata_marvell.c
@@ -57,11 +57,11 @@
 	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;