From f7262f63b10476fec5fcfae880323a3b60b9b450 Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Mon, 7 Dec 2009 12:51:36 +0100
Subject: [PATCH] --- yaml --- r: 173247 b: refs/heads/master c:
 ec64333c3a9bc52e34d79cff23acf4e5764b1353 h: refs/heads/master i:   173245:
 dd48f61c89be55bb944d4034938b89b5a86823f2   173243:
 d485a5f5af7efada934152eb7b21456d6f3c14c3   173239:
 517da26035fc025369930bd7a7cab3dabcf35bb4   173231:
 0f0f8c278aa12edf7c2d0ed45c6e9bda0369a169   173215:
 a85ee31a85c7c474a5c91d62f825a8f20f056c62   173183:
 54660032d35118d36ee94a7c8dbef889d51c6a8f v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/s390/cio/device_fsm.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4faafd42c52c..2122d389d21e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56e6b796fe9b99287648fc5686aae00106b37bab
+refs/heads/master: ec64333c3a9bc52e34d79cff23acf4e5764b1353
diff --git a/trunk/drivers/s390/cio/device_fsm.c b/trunk/drivers/s390/cio/device_fsm.c
index 862b89ef3ee6..ae760658a131 100644
--- a/trunk/drivers/s390/cio/device_fsm.c
+++ b/trunk/drivers/s390/cio/device_fsm.c
@@ -229,7 +229,8 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
 
 	sch = to_subchannel(cdev->dev.parent);
 
-	cio_disable_subchannel(sch);
+	if (cio_disable_subchannel(sch))
+		state = DEV_STATE_NOT_OPER;
 	/*
 	 * Now that we tried recognition, we have performed device selection
 	 * through ssch() and the path information is up to date.