diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2011-07-08 14:53:36 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-07-15 17:58:20 -0400 |
commit | f0c077a8b7f9dce590c760a7b2f3c417dffa52d1 (patch) | |
tree | ef6d08aa3ca1d79000db7d7479d98bda04a11c78 /drivers/s390/cio/css.c | |
parent | 1d8047a6f7973470bb1de4606a6e00c0bbee3cc6 (diff) |
PM: Improve error code of pm_notifier_call_chain()
This enables pm_notifier_call_chain() to get the actual error code
in the callback rather than always assume -EINVAL by converting all
PM notifier calls to return encapsulate error code with
notifier_from_errno().
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
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 */ |