diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-15 08:42:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-15 08:42:40 -0700 |
| commit | a23c218bd36e11120daf18e00a91d5dc20e288e6 (patch) | |
| tree | 0cb78182bddc622d9464465555eefc8e9ad92343 /arch/powerpc/platforms/pseries/eeh_driver.c | |
| parent | ea34f43a074af85823e49b9bf62f47d8d3f0e81a (diff) | |
| parent | b71a0c296cee4debaf446760fbd29ead1587a7ac (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: pseries/dtl.c should include asm/firmware.h
powerpc: Fix data-corrupting bug in __futex_atomic_op
powerpc/pseries: Set error_state to pci_channel_io_normal in eeh_report_reset()
powerpc: Allow 256kB pages with SHMEM
powerpc: Document new FSL I2C bindings and cleanup
powerpc/mm: Fix compile warning
powerpc/85xx: TQM8548: update defconfig
powerpc/85xx: TQM8548: use proper phy-handles for enet2 and enet3
powerpc/85xx: TQM85xx: correct address of LM75 I2C device nodes
powerpc: Add support for early tlbilx opcode
powerpc: Fix tlbilx opcode
Diffstat (limited to 'arch/powerpc/platforms/pseries/eeh_driver.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/eeh_driver.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index 380420f8c40..9a2a6e32f00 100644 --- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/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 || |