diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 390b4e96fd0d1d6085cac76e7d1b5857036c34e1..fe18ef691bb781ee3ed6666353d2119736bd1490 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -564,11 +564,6 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid)
 			goto out;
 	}
 	mutex_init(&sch->reg_mutex);
-	/* Set a name for the subchannel */
-	if (cio_is_console(schid))
-		sch->dev.init_name = cio_get_console_sch_name(schid);
-	else
-		dev_set_name(&sch->dev, "0.%x.%04x", schid.ssid, schid.sch_no);
 
 	/*
 	 * The first subchannel that is not-operational (ccode==3)
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 40d4b3093b718cacbaca1c514e999aed44e10fca..0dc6f6d26287d0f12ca97537b53ad7ca4d34bea6 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -183,6 +183,11 @@ static int css_sch_device_register(struct subchannel *sch)
 	int ret;
 
 	mutex_lock(&sch->reg_mutex);
+	if (cio_is_console(sch->schid))
+		sch->dev.init_name = cio_get_console_sch_name(sch->schid);
+	else
+		dev_set_name(&sch->dev, "0.%x.%04x", sch->schid.ssid,
+			     sch->schid.sch_no);
 	ret = device_register(&sch->dev);
 	mutex_unlock(&sch->reg_mutex);
 	return ret;