diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2007-03-02 09:56:35 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-03-02 18:18:38 -0500 |
commit | cc7c15ec167767b440c1de4dbd2200467b7a493b (patch) | |
tree | 19fcd6f5a77d3c1f87ed8faf215fb4af50827d6c | |
parent | fb9f8905a8865679f1fb757380b4169571def0ca (diff) |
pata_qdi: Fix initialisation
The QDI init code contains some bugs which mean it only works if you have
a test setup that causes both a successful and failed probe. Fix this
Found by Philip Guo
(Who found it working on code analysis tools not running VLB IDE
controllers)
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/ata/pata_qdi.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c index c2f87da60336..c3810012f3f4 100644 --- a/drivers/ata/pata_qdi.c +++ b/drivers/ata/pata_qdi.c | |||
@@ -363,7 +363,8 @@ static __init int qdi_init(void) | |||
363 | release_region(port, 2); | 363 | release_region(port, 2); |
364 | continue; | 364 | continue; |
365 | } | 365 | } |
366 | ct += qdi_init_one(port, 6500, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04); | 366 | if (qdi_init_one(port, 6500, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04) == 0) |
367 | ct++; | ||
367 | } | 368 | } |
368 | if (((r & 0xF0) == 0xA0) || (r & 0xF0) == 0x50) { | 369 | if (((r & 0xF0) == 0xA0) || (r & 0xF0) == 0x50) { |
369 | /* QD6580: dual channel */ | 370 | /* QD6580: dual channel */ |
@@ -375,11 +376,14 @@ static __init int qdi_init(void) | |||
375 | res = inb(port + 3); | 376 | res = inb(port + 3); |
376 | if (res & 1) { | 377 | if (res & 1) { |
377 | /* Single channel mode */ | 378 | /* Single channel mode */ |
378 | ct += qdi_init_one(port, 6580, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04); | 379 | if (qdi_init_one(port, 6580, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04)) |
380 | ct++; | ||
379 | } else { | 381 | } else { |
380 | /* Dual channel mode */ | 382 | /* Dual channel mode */ |
381 | ct += qdi_init_one(port, 6580, 0x1F0, 14, r & 0x04); | 383 | if (qdi_init_one(port, 6580, 0x1F0, 14, r & 0x04) == 0) |
382 | ct += qdi_init_one(port + 2, 6580, 0x170, 15, r & 0x04); | 384 | ct++; |
385 | if (qdi_init_one(port + 2, 6580, 0x170, 15, r & 0x04) == 0) | ||
386 | ct++; | ||
383 | } | 387 | } |
384 | } | 388 | } |
385 | } | 389 | } |