aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/cio.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/cio/cio.c')
-rw-r--r--drivers/s390/cio/cio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 6ebf1b507362..33bff8fec7d1 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -74,7 +74,6 @@ out_unregister:
74 debug_unregister(cio_debug_trace_id); 74 debug_unregister(cio_debug_trace_id);
75 if (cio_debug_crw_id) 75 if (cio_debug_crw_id)
76 debug_unregister(cio_debug_crw_id); 76 debug_unregister(cio_debug_crw_id);
77 printk(KERN_WARNING"cio: could not initialize debugging\n");
78 return -1; 77 return -1;
79} 78}
80 79
@@ -755,7 +754,6 @@ cio_get_console_sch_no(void)
755 /* unlike in 2.4, we cannot autoprobe here, since 754 /* unlike in 2.4, we cannot autoprobe here, since
756 * the channel subsystem is not fully initialized. 755 * the channel subsystem is not fully initialized.
757 * With some luck, the HWC console can take over */ 756 * With some luck, the HWC console can take over */
758 printk(KERN_WARNING "cio: No ccw console found!\n");
759 return -1; 757 return -1;
760 } 758 }
761 return console_irq; 759 return console_irq;
@@ -772,6 +770,7 @@ cio_probe_console(void)
772 sch_no = cio_get_console_sch_no(); 770 sch_no = cio_get_console_sch_no();
773 if (sch_no == -1) { 771 if (sch_no == -1) {
774 console_subchannel_in_use = 0; 772 console_subchannel_in_use = 0;
773 printk(KERN_WARNING "cio: No ccw console found!\n");
775 return ERR_PTR(-ENODEV); 774 return ERR_PTR(-ENODEV);
776 } 775 }
777 memset(&console_subchannel, 0, sizeof(struct subchannel)); 776 memset(&console_subchannel, 0, sizeof(struct subchannel));