Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 6fec90eab00e..89320c1ad825 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -519,6 +519,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
         memset(sch, 0, sizeof(struct subchannel));
 
         spin_lock_init(&sch->lock);
+        mutex_init(&sch->reg_mutex);
 
         /* Set a name for the subchannel */
         snprintf (sch->dev.bus_id, BUS_ID_SIZE, "0.%x.%04x", schid.ssid,
@@ -797,7 +798,7 @@ struct subchannel *
 cio_get_console_subchannel(void)
 {
         if (!console_subchannel_in_use)
-                return 0;
+                return NULL;
         return &console_subchannel;
 }
 
@@ -875,5 +876,6 @@ void
 reipl(unsigned long devno)
 {
         clear_all_subchannels();
+        cio_reset_channel_paths();
         do_reipl(devno);
 }