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/char | |
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/char')
-rw-r--r-- | drivers/s390/char/vmwatchdog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c index 12ef9121d4f0..11312f401c70 100644 --- a/drivers/s390/char/vmwatchdog.c +++ b/drivers/s390/char/vmwatchdog.c | |||
@@ -258,13 +258,13 @@ static int vmwdt_suspend(void) | |||
258 | if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) { | 258 | if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) { |
259 | pr_err("The system cannot be suspended while the watchdog" | 259 | pr_err("The system cannot be suspended while the watchdog" |
260 | " is in use\n"); | 260 | " is in use\n"); |
261 | return NOTIFY_BAD; | 261 | return notifier_from_errno(-EBUSY); |
262 | } | 262 | } |
263 | if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) { | 263 | if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) { |
264 | clear_bit(VMWDT_OPEN, &vmwdt_is_open); | 264 | clear_bit(VMWDT_OPEN, &vmwdt_is_open); |
265 | pr_err("The system cannot be suspended while the watchdog" | 265 | pr_err("The system cannot be suspended while the watchdog" |
266 | " is running\n"); | 266 | " is running\n"); |
267 | return NOTIFY_BAD; | 267 | return notifier_from_errno(-EBUSY); |
268 | } | 268 | } |
269 | return NOTIFY_DONE; | 269 | return NOTIFY_DONE; |
270 | } | 270 | } |