From 182d0045e8e6f9aa804193293fa0f9af894a3460 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 26 Feb 2008 21:50:35 +0100 Subject: [PATCH] --- yaml --- r: 86407 b: refs/heads/master c: 788d669736dd3d15195fea07bf97ec5a2e9f15e7 h: refs/heads/master i: 86405: 09aa751821edc152979dc307491604b5423a69cf 86403: a0785dc4fa15a3faf8340982a403b64409aafc9b 86399: 25a0c42b1e082da2e1a1ef16d6cc250badc3d6d3 v: v3 --- [refs] | 2 +- trunk/drivers/ide/legacy/qd65xx.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2981314b07da..334b0508c919 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c53ea18dc29a1ac075119f651d6ac4386a549a34 +refs/heads/master: 788d669736dd3d15195fea07bf97ec5a2e9f15e7 diff --git a/trunk/drivers/ide/legacy/qd65xx.c b/trunk/drivers/ide/legacy/qd65xx.c index bba29df5f21d..1ec0e970f577 100644 --- a/trunk/drivers/ide/legacy/qd65xx.c +++ b/trunk/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 */ } }