aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2008-10-21 01:26:39 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-10-22 20:40:19 -0400
commit848e4c68c4695beae563f9a3d59fce596b466a74 (patch)
tree90c5ea1ff1b016f72888641f96f014336e969434 /drivers
parent570106df6bdb4907ad7f70793079c762f34d561a (diff)
libata: transfer EHI control flags to slave ehc.i
ATA_EHI_NO_AUTOPSY and ATA_EHI_QUIET are used to control the behavior of EH. As only the master link is visible outside EH, these flags are set only for the master link although they should also apply to the slave link, which causes spurious EH messages during probe and suspend/resume. This patch transfers those two flags to slave ehc.i before performing slave autopsy and reporting. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/libata-eh.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index a93247cc395a..d2409a8acece 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2010,8 +2010,13 @@ void ata_eh_autopsy(struct ata_port *ap)
2010 struct ata_eh_context *mehc = &ap->link.eh_context; 2010 struct ata_eh_context *mehc = &ap->link.eh_context;
2011 struct ata_eh_context *sehc = &ap->slave_link->eh_context; 2011 struct ata_eh_context *sehc = &ap->slave_link->eh_context;
2012 2012
2013 /* transfer control flags from master to slave */
2014 sehc->i.flags |= mehc->i.flags & ATA_EHI_TO_SLAVE_MASK;
2015
2016 /* perform autopsy on the slave link */
2013 ata_eh_link_autopsy(ap->slave_link); 2017 ata_eh_link_autopsy(ap->slave_link);
2014 2018
2019 /* transfer actions from slave to master and clear slave */
2015 ata_eh_about_to_do(ap->slave_link, NULL, ATA_EH_ALL_ACTIONS); 2020 ata_eh_about_to_do(ap->slave_link, NULL, ATA_EH_ALL_ACTIONS);
2016 mehc->i.action |= sehc->i.action; 2021 mehc->i.action |= sehc->i.action;
2017 mehc->i.dev_action[1] |= sehc->i.dev_action[1]; 2022 mehc->i.dev_action[1] |= sehc->i.dev_action[1];