2 files changed, 10 insertions, 4 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index c4d2f667a2f6..9f016fef6101 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -482,17 +482,21 @@ static int online_store_recog_and_online(struct ccw_device *cdev)
                 }
                 wait_event(cdev->private->wait_q,
                            cdev->private->flags.recog_done);
+                if (cdev->private->state != DEV_STATE_OFFLINE)
+                        /* recognition failed */
+                        return -EAGAIN;
         }
         if (cdev->drv && cdev->drv->set_online)
                 ccw_device_set_online(cdev);
         return 0;
 }
+
 static int online_store_handle_online(struct ccw_device *cdev, int force)
 {
         int ret;
 
         ret = online_store_recog_and_online(cdev);
-        if (ret)
+        if (ret && !force)
                 return ret;
         if (force && cdev->private->state == DEV_STATE_BOXED) {
                 ret = ccw_device_stlck(cdev);
@@ -500,7 +504,9 @@ static int online_store_handle_online(struct ccw_device *cdev, int force)
                         return ret;
                 if (cdev->id.cu_type == 0)
                         cdev->private->state = DEV_STATE_NOT_OPER;
-                online_store_recog_and_online(cdev);
+                ret = online_store_recog_and_online(cdev);
+                if (ret)
+                        return ret;
         }
         return 0;
 }
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 87b4bfca080f..ccd72f95765f 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -260,6 +260,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
                 if (state == DEV_STATE_NOT_OPER) {
                         cdev->private->flags.recog_done = 1;
                         cdev->private->state = DEV_STATE_DISCONNECTED;
+                        wake_up(&cdev->private->wait_q);
                         return;
                 }
                 /* Boxed devices don't need extra treatment. */
@@ -311,8 +312,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
         }
         cdev->private->state = state;
         io_subchannel_recog_done(cdev);
-        if (state != DEV_STATE_NOT_OPER)
-                wake_up(&cdev->private->wait_q);
+        wake_up(&cdev->private->wait_q);
 }
 
 /*