diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 15:53:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 15:53:10 -0800 |
| commit | e2e29831cc463f4be61d4e36b8699ae7e071a685 (patch) | |
| tree | d5c40f6a328e07edb2db7186bef3a6c932c404fb /drivers/ide/ide-probe.c | |
| parent | 9a689bc4f09f8b89f88e65b1b0a2ea780b4f28de (diff) | |
| parent | 95964018d53f479529dfdc2b46fe30c0a14a00e0 (diff) | |
| download | talos-obmc-linux-e2e29831cc463f4be61d4e36b8699ae7e071a685.tar.gz talos-obmc-linux-e2e29831cc463f4be61d4e36b8699ae7e071a685.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
alim15x3: fix sparse warning
ide: remove dead code from drive_is_ready()
ide: fix build for DEBUG_PM
ide: respect current DMA setting during resume
ide: add SAMSUNG SP0822N with firmware WA100-10 to ivb_list[]
amd74xx: workaround unreliable AltStatus register for nVidia controllers
ide: fix the ide_release_lock imbalance
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 1649ea54f76c..c55bdbd22314 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -266,7 +266,8 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd) /* take a deep breath */ msleep(50); - if (io_ports->ctl_addr) { + if (io_ports->ctl_addr && + (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) { a = tp_ops->read_altstatus(hwif); s = tp_ops->read_status(hwif); if ((a ^ s) & ~ATA_IDX) |
