Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / s390 / char / sclp_sdias.c

diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c
index 1c064976b32bd322a4e4554e9d335bf1cef71328..8b854857ba0733eb5a8a56a9451318a8d383603c 100644 (file)
--- a/drivers/s390/char/sclp_sdias.c
+++ b/drivers/s390/char/sclp_sdias.c
@@ -239,10 +239,8 @@ int __init sclp_sdias_init(void)
        debug_register_view(sdias_dbf, &debug_sprintf_view);
        debug_set_level(sdias_dbf, 6);
        rc = sclp_register(&sclp_sdias_register);
-       if (rc) {
-               ERROR_MSG("sclp register failed\n");
+       if (rc)
                return rc;
-       }
        init_waitqueue_head(&sdias_wq);
        TRACE("init done\n");
        return 0;