3 files changed, 13 insertions, 5 deletions

diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 1990285296c6..c316051d9bda 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -1252,7 +1252,7 @@ static __init int sclp_initcall(void)
                 return rc;
 
         sclp_pdev = platform_device_register_simple("sclp", -1, NULL, 0);
-        rc = PTR_RET(sclp_pdev);
+        rc = PTR_ERR_OR_ZERO(sclp_pdev);
         if (rc)
                 goto fail_platform_driver_unregister;
 
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 6e8f90f84e49..6e14999f9e8f 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -515,7 +515,7 @@ static int __init sclp_detect_standby_memory(void)
         if (rc)
                 goto out;
         sclp_pdev = platform_device_register_simple("sclp_mem", -1, NULL, 0);
-        rc = PTR_RET(sclp_pdev);
+        rc = PTR_ERR_OR_ZERO(sclp_pdev);
         if (rc)
                 goto out_driver;
         sclp_add_standby_memory();
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index 4eed38cd0af6..cd9c91909596 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -97,13 +97,16 @@ static void sclp_vt220_pm_event_fn(struct sclp_register *reg,
 static int __sclp_vt220_emit(struct sclp_vt220_request *request);
 static void sclp_vt220_emit_current(void);
 
-/* Registration structure for our interest in SCLP event buffers */
+/* Registration structure for SCLP output event buffers */
 static struct sclp_register sclp_vt220_register = {
         .send_mask              = EVTYP_VT220MSG_MASK,
+        .pm_event_fn            = sclp_vt220_pm_event_fn,
+};
+
+/* Registration structure for SCLP input event buffers */
+static struct sclp_register sclp_vt220_register_input = {
         .receive_mask           = EVTYP_VT220MSG_MASK,
-        .state_change_fn        = NULL,
         .receiver_fn            = sclp_vt220_receiver_fn,
-        .pm_event_fn            = sclp_vt220_pm_event_fn,
 };
 
 
@@ -715,9 +718,14 @@ static int __init sclp_vt220_tty_init(void)
         rc = tty_register_driver(driver);
         if (rc)
                 goto out_init;
+        rc = sclp_register(&sclp_vt220_register_input);
+        if (rc)
+                goto out_reg;
         sclp_vt220_driver = driver;
         return 0;
 
+out_reg:
+        tty_unregister_driver(driver);
 out_init:
         __sclp_vt220_cleanup();
 out_driver: