aboutsummaryrefslogtreecommitdiff
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorLinas Vepstas <linas@austin.ibm.com>2006-09-18 20:58:06 -0700
committerJeff Garzik <jeff@garzik.org>2006-09-19 00:04:29 -0400
commit72e8d6bbc151ca670c66d58a37e5bbfbc041db69 (patch)
tree20546e26d6b09ba8e3e8421b8a8945e1006833a9 /kernel/printk.c
parentf50e5ea14baa321c5f0ff71707a83b02bf5b9398 (diff)
[PATCH] e1000 disable device on PCI error
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 e1000 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> Cc: John Ronciak <john.ronciak@intel.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Auke Kok <auke-jan.h.kok@intel.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'kernel/printk.c')
0 files changed, 0 insertions, 0 deletions