tree 3ebdd35056a551d2605ea62fedd30f0476abf0c7
parent 4187592b6d2230d4f9f7177c369dde2aef1a4337
author Linas Vepstas <linas@austin.ibm.com> 1157059668 -0700
committer Auke Kok <juke-jan.h.kok@intel.com> 1157059668 -0700

e100: fix error recovery

A recent patch in -mm3 titled
"gregkh-pci-pci-don-t-enable-device-if-already-enabled.patch" causes
pci_enable_device() to be a no-op if the kernel thinks that the device is
already enabled.  This change breaks the PCI error recovery mechanism in
the e100 device driver, since, after PCI slot reset, the card is no longer
enabled.  This is a trivial fix for this problem.  Tested.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>