diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 19:01:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 19:01:57 -0400 |
| commit | 431bf99d26157d56689e5de65bd27ce9f077fc3f (patch) | |
| tree | b15e357039956fcdd0e0e6177d2fc99bb3cfa822 /drivers/s390/cio/css.c | |
| parent | 72f96e0e38d7e29ba16dcfd824ecaebe38b8293e (diff) | |
| parent | 7ae033cc0dfce68d8e0c83aca60837cf2bf0d2e6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (51 commits)
PM: Improve error code of pm_notifier_call_chain()
PM: Add "RTC" to PM trace time stamps to avoid confusion
PM / Suspend: Export suspend_set_ops, suspend_valid_only_mem
PM / Suspend: Add .suspend_again() callback to suspend_ops
PM / OPP: Introduce function to free cpufreq table
ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active
PM / Domains: Take .power_off() error code into account
ARM / shmobile: Use genpd_queue_power_off_work()
ARM / shmobile: Use pm_genpd_poweroff_unused()
PM / Domains: Introduce function to power off all unused PM domains
OMAP: PM: disable idle on suspend for GPIO and UART
OMAP: PM: omap_device: add API to disable idle on suspend
OMAP: PM: omap_device: add system PM methods for PM domain handling
OMAP: PM: omap_device: conditionally use PM domain runtime helpers
PM / Runtime: Add new helper function: pm_runtime_status_suspended()
PM / Domains: Queue up power off work only if it is not pending
PM / Domains: Improve handling of wakeup devices during system suspend
PM / Domains: Do not restore all devices on power off error
PM / Domains: Allow callbacks to execute all runtime PM helpers
PM / Domains: Do not execute device callbacks under locks
...
Diffstat (limited to 'drivers/s390/cio/css.c')
| -rw-r--r-- | drivers/s390/cio/css.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index c47b25fd3f43..92d7324acb1c 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
| @@ -814,8 +814,8 @@ static int css_power_event(struct notifier_block *this, unsigned long event, | |||
| 814 | mutex_unlock(&css->mutex); | 814 | mutex_unlock(&css->mutex); |
| 815 | continue; | 815 | continue; |
| 816 | } | 816 | } |
| 817 | if (__chsc_do_secm(css, 0)) | 817 | ret = __chsc_do_secm(css, 0); |
| 818 | ret = NOTIFY_BAD; | 818 | ret = notifier_from_errno(ret); |
| 819 | mutex_unlock(&css->mutex); | 819 | mutex_unlock(&css->mutex); |
| 820 | } | 820 | } |
| 821 | break; | 821 | break; |
| @@ -831,8 +831,8 @@ static int css_power_event(struct notifier_block *this, unsigned long event, | |||
| 831 | mutex_unlock(&css->mutex); | 831 | mutex_unlock(&css->mutex); |
| 832 | continue; | 832 | continue; |
| 833 | } | 833 | } |
| 834 | if (__chsc_do_secm(css, 1)) | 834 | ret = __chsc_do_secm(css, 1); |
| 835 | ret = NOTIFY_BAD; | 835 | ret = notifier_from_errno(ret); |
| 836 | mutex_unlock(&css->mutex); | 836 | mutex_unlock(&css->mutex); |
| 837 | } | 837 | } |
| 838 | /* search for subchannels, which appeared during hibernation */ | 838 | /* search for subchannels, which appeared during hibernation */ |