From 261d8610c7e55bd7f56a37a4b665a5b31f1f895e Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 18 Jan 2007 17:22:18 +0900 Subject: [PATCH] --- yaml --- r: 45584 b: refs/heads/master c: 79a55b72a1996f77e9d23c7a5282e5839d45beb3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-eh.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 849afb70c1a4..c171ee30b349 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 501e0c500217e38276d61445ee0839b3f2c66d05 +refs/heads/master: 79a55b72a1996f77e9d23c7a5282e5839d45beb3 diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c index 08ad44b3e48f..56cf59b60ec4 100644 --- a/trunk/drivers/ata/libata-eh.c +++ b/trunk/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);