Power management fix for 2.6.39

GIT PULL Rafael J. Wysocki 1 participant 1 message Mar 18, 2011

lore

Share & tools

lore

Rafael J. Wysocki

author

2011-03-18 19:53 UTC #0 lore raw

Hi Linus,

Please pull a power management fix for 2.6.39 from:

git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git pm-fixes

This patch should have gone before commit 9659cc0678b954f187290c6e8b247a673c5d37e1 (PM: Make system-wide PM and runtime PM treat subsystems consistently), because without the changes made by it this commit introduces a suspend regression. Unfortunately, it was missing from my for-2.6.39 queue and didn't make it to the previous pull request. Sorry about that.

 drivers/usb/core/driver.c |   15 +++------------
 drivers/usb/core/usb.c    |    5 +++++
 drivers/usb/core/usb.h    |    3 +++
 3 files changed, 11 insertions(+), 12 deletions(-)

---------------

Rafael J. Wysocki (1):
USB: Move runtime PM callbacks to usb_device_pm_ops