3 files changed, 14 insertions, 3 deletions

diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig
index db2cb1f8a1b5..a5c6f7e157aa 100644
--- a/drivers/s390/char/Kconfig
+++ b/drivers/s390/char/Kconfig
@@ -102,6 +102,16 @@ config SCLP_ASYNC
           want for inform other people about your kernel panics,
           need this feature and intend to run your kernel in LPAR.
 
+config SCLP_ASYNC_ID
+       string "Component ID for Call Home"
+       depends on SCLP_ASYNC
+       default "000000000"
+       help
+         The Component ID for Call Home is used to identify the correct
+         problem reporting queue the call home records should be sent to.
+
+         If your are unsure, please use the default value "000000000".
+
 config HMC_DRV
         def_tristate m
         prompt "Support for file transfers from HMC drive CD/DVD-ROM"
diff --git a/drivers/s390/char/sclp_async.c b/drivers/s390/char/sclp_async.c
index 5f9f929e891c..19c25427f27f 100644
--- a/drivers/s390/char/sclp_async.c
+++ b/drivers/s390/char/sclp_async.c
@@ -137,7 +137,8 @@ static int sclp_async_send_wait(char *message)
          * Retain Queue
          * e.g. 5639CC140 500 Red Hat RHEL5 Linux for zSeries (RHEL AS)
          */
-        strncpy(sccb->evbuf.comp_id, "000000000", sizeof(sccb->evbuf.comp_id));
+        strncpy(sccb->evbuf.comp_id, CONFIG_SCLP_ASYNC_ID,
+                sizeof(sccb->evbuf.comp_id));
         sccb->evbuf.header.length = sizeof(sccb->evbuf);
         sccb->header.length = sizeof(sccb->evbuf) + sizeof(sccb->header);
         sccb->header.function_code = SCLP_NORMAL_WRITE;
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 327cb19ad0b0..d3d1936057b4 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -1090,7 +1090,7 @@ tape_3590_print_io_sim_msg_f1(struct tape_device *device, struct irb *irb)
                                 "channel path 0x%x on CU",
                                 sense->fmt.f71.md[1]);
                 else
-                        snprintf(service, BUFSIZE, "Repair will disable cannel"
+                        snprintf(service, BUFSIZE, "Repair will disable channel"
                                 " paths (0x%x-0x%x) on CU",
                                 sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                 break;
@@ -1481,7 +1481,7 @@ tape_3590_irq(struct tape_device *device, struct tape_request *request,
         }
 
         if (irb->scsw.cmd.dstat & DEV_STAT_CHN_END) {
-                DBF_EVENT(2, "cannel end\n");
+                DBF_EVENT(2, "channel end\n");
                 return TAPE_IO_PENDING;
         }