diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2007-03-02 14:56:35 +0000 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-03-02 18:18:38 -0500 |
| commit | cc7c15ec167767b440c1de4dbd2200467b7a493b (patch) | |
| tree | 19fcd6f5a77d3c1f87ed8faf215fb4af50827d6c /drivers/ata | |
| parent | fb9f8905a8865679f1fb757380b4169571def0ca (diff) | |
| download | kernel-crypto-cc7c15ec167767b440c1de4dbd2200467b7a493b.tar.gz kernel-crypto-cc7c15ec167767b440c1de4dbd2200467b7a493b.tar.xz kernel-crypto-cc7c15ec167767b440c1de4dbd2200467b7a493b.zip | |
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>
Diffstat (limited to 'drivers/ata')
| -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 c2f87da6033..c3810012f3f 100644 --- a/drivers/ata/pata_qdi.c +++ b/drivers/ata/pata_qdi.c @@ -363,7 +363,8 @@ static __init int qdi_init(void) release_region(port, 2); continue; } - ct += qdi_init_one(port, 6500, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04); + if (qdi_init_one(port, 6500, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04) == 0) + ct++; } if (((r & 0xF0) == 0xA0) || (r & 0xF0) == 0x50) { /* QD6580: dual channel */ @@ -375,11 +376,14 @@ static __init int qdi_init(void) res = inb(port + 3); if (res & 1) { /* Single channel mode */ - ct += qdi_init_one(port, 6580, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04); + if (qdi_init_one(port, 6580, ide_port[r & 0x01], ide_irq[r & 0x01], r & 0x04)) + ct++; } else { /* Dual channel mode */ - ct += qdi_init_one(port, 6580, 0x1F0, 14, r & 0x04); - ct += qdi_init_one(port + 2, 6580, 0x170, 15, r & 0x04); + if (qdi_init_one(port, 6580, 0x1F0, 14, r & 0x04) == 0) + ct++; + if (qdi_init_one(port + 2, 6580, 0x170, 15, r & 0x04) == 0) + ct++; } } } |