diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 11:30:47 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 11:30:47 -0800 |
commit | ab1127823b757ec945a048c3385eb1f99a459823 (patch) | |
tree | 80bc28b5d6b4f1091f82da3d631200dd982b20b9 /drivers/ata/libata-eh.c | |
parent | 365bbe0d0caaf2ba74d56556827babf0bc66965d (diff) | |
parent | e93f09dc2d49d8e98818a93ad17f3ede91533738 (diff) |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
sata_mv HighPoint 2310 support (88SX7042)
libata: fix handling of port actions in per-dev action mask
libata: initialize qc->dma_dir to DMA_NONE
sata_via: add PCI ID 0x5337
libata doc: "error : unterminated entity reference exceptions"
Diffstat (limited to 'drivers/ata/libata-eh.c')
-rw-r--r-- | drivers/ata/libata-eh.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 08ad44b3e48..56cf59b60ec 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -1979,6 +1979,10 @@ static int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, ehc->tries[dev->devno] = ATA_EH_DEV_TRIES; + /* collect port action mask recorded in dev actions */ + ehc->i.action |= ehc->i.dev_action[i] & ~ATA_EH_PERDEV_MASK; + ehc->i.dev_action[i] &= ATA_EH_PERDEV_MASK; + /* process hotplug request */ if (dev->flags & ATA_DFLAG_DETACH) ata_eh_detach_dev(dev); |