USB/PCI: Fix resume breakage of controllers behind cardbus bridges
authorRafael J. Wysocki <rjw@sisk.pl>
Fri, 13 Feb 2009 22:41:12 +0000 (23:41 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Feb 2009 00:56:31 +0000 (16:56 -0800)
commit3494252d5644993f407a45f01c3e8ad5ae38f93c
tree01821aeeb26febe7da71ff6968eaed5b28e4b4f7
parente78ac4b9deb8f36d8c828b6d91232960f109d951
USB/PCI: Fix resume breakage of controllers behind cardbus bridges

If a USB PCI controller is behind a cardbus bridge, we are trying to
restore its configuration registers too early, before the cardbus
bridge is operational.  To fix this, call pci_restore_state() from
usb_hcd_pci_resume() and remove usb_hcd_pci_resume_early() which is
no longer necessary (the configuration spaces of USB controllers that
are not behind cardbus bridges will be restored by the PCI PM core
with interrupts disabled anyway).

This patch fixes the regression from 2.6.28 tracked as
http://bugzilla.kernel.org/show_bug.cgi?id=12659

[ Side note: the proper long-term fix is probably to just force the
  unplug event at suspend time instead of doing a plug/unplug at resume
  time, but this patch is fine regardless  - Linus ]

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Reported-by: Miles Lane <miles.lane@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/usb/core/hcd-pci.c
drivers/usb/core/hcd.h
drivers/usb/host/ehci-pci.c
drivers/usb/host/ohci-pci.c
drivers/usb/host/uhci-hcd.c