diff --git a/[refs] b/[refs]
index ebf83f9961d3..851980eb53ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c4d964fa4e857d6fb6b63159a898a5c63c173bf
+refs/heads/master: 1f5bd3848bfc56de4c32ef6971a6a966776204bb
diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c
index 7ad6bfb2e55e..afa362ce9e85 100644
--- a/trunk/drivers/s390/cio/device.c
+++ b/trunk/drivers/s390/cio/device.c
@@ -488,7 +488,9 @@ static int online_store_recog_and_online(struct ccw_device *cdev)
 {
 	/* Do device recognition, if needed. */
 	if (cdev->private->state == DEV_STATE_BOXED) {
+		spin_lock_irq(cdev->ccwlock);
 		ccw_device_recognition(cdev);
+		spin_unlock_irq(cdev->ccwlock);
 		wait_event(cdev->private->wait_q,
 			   cdev->private->flags.recog_done);
 		if (cdev->private->state != DEV_STATE_OFFLINE)