summaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_marvell.c
diff options
context:
space:
mode:
authorAlan <alan@lxorguk.ukuu.org.uk>2006-11-27 16:37:52 +0000
committerJeff Garzik <jeff@garzik.org>2006-12-01 22:47:03 -0500
commit099156db555aabf54dc80b40abb628ce35d90065 (patch)
tree5e26cfe6e0dd3531d0a54cf2a70be6364814da5d /drivers/ata/pata_marvell.c
parentaff0df0593f4beea42800115c0658f58c03dfe9f (diff)
downloadlinux-099156db555aabf54dc80b40abb628ce35d90065.tar.gz
linux-099156db555aabf54dc80b40abb628ce35d90065.tar.bz2
linux-099156db555aabf54dc80b40abb628ce35d90065.zip
[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> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_marvell.c')
-rw-r--r--drivers/ata/pata_marvell.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index a5953c389264..25f7a79a8e25 100644
--- 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;