projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
drivers
/
char
/
apm-emulation.c
diff --git
a/drivers/char/apm-emulation.c
b/drivers/char/apm-emulation.c
index 548708c4b2b84fbc3200b843bb701e154550244b..a7346ab97a3c22002ffc6948321ca24b1720b8f9 100644
(file)
--- a/
drivers/char/apm-emulation.c
+++ b/
drivers/char/apm-emulation.c
@@
-606,7
+606,7
@@
static int apm_suspend_notifier(struct notifier_block *nb,
return NOTIFY_OK;
/* interrupted by signal */
- return
NOTIFY_BAD
;
+ return
notifier_from_errno(err)
;
case PM_POST_SUSPEND:
/*