Messages in this thread Patch in this message | | | Date | Mon, 27 Nov 2006 16:37:52 +0000 | From | Alan <> | Subject | [PATCH] pata_marvell: merge Mandriva patches |
| |
Correct and complete the Marvell PATA cable detection logic.
From: Arnaud Patard <apatard@mandriva.com> Signed-off-by: Arnaud Patard <apatard@mandriva.com> Signed-off-by: Alan Cox <alan@redhat.com>
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 --- linux.vanilla-2.6.19-rc6-mm1/drivers/ata/pata_marvell.c 2006-11-24 13:58:28.000000000 +0000 +++ linux-2.6.19-rc6-mm1/drivers/ata/pata_marvell.c 2006-11-24 14:31:46.000000000 +0000 @@ -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; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |