Merge branch 'fix/misc' into for-linus

[pandora-kernel.git] / drivers / s390 / char / vmwatchdog.c

diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index cb7854c..f2bc287 100644 (file)
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -250,14 +250,14 @@ static int vmwdt_resume(void)
 static int vmwdt_suspend(void)
 {
        if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) {
-               pr_err("The watchdog is in use. "
-                       "This prevents hibernation or suspend.\n");
+               pr_err("The system cannot be suspended while the watchdog"
+                       " is in use\n");
                return NOTIFY_BAD;
        }
        if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) {
                clear_bit(VMWDT_OPEN, &vmwdt_is_open);
-               pr_err("The watchdog is running. "
-                       "This prevents hibernation or suspend.\n");
+               pr_err("The system cannot be suspended while the watchdog"
+                       " is running\n");
                return NOTIFY_BAD;
        }
        return NOTIFY_DONE;