From f4e847a09a9a24d897623fc7706abdf58ee06255 Mon Sep 17 00:00:00 2001 From: Mike Mason Date: Fri, 10 Apr 2009 08:57:03 +0000 Subject: [PATCH] --- yaml --- r: 143318 b: refs/heads/master c: c58dc575f3c8bdc69fb868ec51e1c80ee7cae5e7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/eeh_driver.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 872f6dd79d50..d6b9b7b2c393 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: adf213c43898f2324cfc35c315556bc21cb65b31 +refs/heads/master: c58dc575f3c8bdc69fb868ec51e1c80ee7cae5e7 diff --git a/trunk/arch/powerpc/platforms/pseries/eeh_driver.c b/trunk/arch/powerpc/platforms/pseries/eeh_driver.c index 380420f8c400..9a2a6e32f00f 100644 --- a/trunk/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/trunk/arch/powerpc/platforms/pseries/eeh_driver.c @@ -182,6 +182,8 @@ static void eeh_report_reset(struct pci_dev *dev, void *userdata) if (!driver) return; + dev->error_state = pci_channel_io_normal; + eeh_enable_irq(dev); if (!driver->err_handler ||