diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index f16c15c13f6e..11f632f9db58 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -577,8 +577,11 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
 	}
 
 	/* Initialization for io subchannels. */
-	if (!css_sch_is_valid(&sch->schib))
-		return -ENODEV;
+	if (!css_sch_is_valid(&sch->schib)) {
+		err = -ENODEV;
+		goto out;
+	}
+
 	/* Devno is valid. */
 	if (is_blacklisted (sch->schid.ssid, sch->schib.pmcw.dev)) {
 		/*