Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm

[pandora-kernel.git] / drivers / char / apm-emulation.c

diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index 7e2709c..2a2b8fd 100644 (file)
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -602,7 +602,7 @@ static int apm_suspend_notifier(struct notifier_block *nb,
                        return NOTIFY_OK;
 
                /* interrupted by signal */
                        return NOTIFY_OK;
 
                /* interrupted by signal */

-               return NOTIFY_BAD;
+               return notifier_from_errno(err);

 
        case PM_POST_SUSPEND:
                /*
 
        case PM_POST_SUSPEND:
                /*