[PATCH] qd65xx: fix setup of QD6580 Control register

From: Bartlomiej Zolnierkiewicz
Date: Sat Feb 23 2008 - 13:58:42 EST


Control register of QD6580 should be setup before probing for devices.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
---
goes after "ide: skip probing port if "hdx=noprobe" was used for both
devices on it" patch in the IDE quilt tree

drivers/ide/legacy/qd65xx.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

Index: b/drivers/ide/legacy/qd65xx.c
===================================================================
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -444,6 +444,8 @@ static int __init qd_probe(int base)
printk(KERN_DEBUG "qd6580: config=%#x, control=%#x, ID3=%u\n",
config, control, QD_ID3);

+ outb(QD_DEF_CONTR, QD_CONTROL_PORT);
+
if (control & QD_CONTR_SEC_DISABLED) {
/* secondary disabled */

@@ -460,8 +462,6 @@ static int __init qd_probe(int base)

ide_device_add(idx, &qd65xx_port_info);

- outb(QD_DEF_CONTR, QD_CONTROL_PORT);
-
return 1;
} else {
ide_hwif_t *mate;
@@ -487,8 +487,6 @@ static int __init qd_probe(int base)

ide_device_add(idx, &qd65xx_port_info);

- outb(QD_DEF_CONTR, QD_CONTROL_PORT);
-
return 0; /* no other qd65xx possible */
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/