---

yaml
---
r: 173227
b: refs/heads/master
c: 60e4dac
h: refs/heads/master
i:
  173225: c89bf4f
  173223: 9324dda
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48e4c385c5f54626651cca027afe242439281899
+refs/heads/master: 60e4dac1abdf49ccdb7545ec406325f08423d848

trunk/drivers/s390/cio/device.c

@@ -888,9 +888,6 @@ static void sch_create_and_recog_new_device(struct subchannel *sch)
 		css_sch_device_unregister(sch);
 		return;
 	}
-	spin_lock_irq(sch->lock);
-	sch_set_cdev(sch, cdev);
-	spin_unlock_irq(sch->lock);
 	/* Start recognition for the new ccw device. */
 	if (io_subchannel_recog(cdev, sch)) {
 		spin_lock_irq(sch->lock);
@@ -1107,7 +1104,6 @@ io_subchannel_recog(struct ccw_device *cdev, struct subchannel *sch)
 	int rc;
 	struct ccw_device_private *priv;
 
-	sch_set_cdev(sch, cdev);
 	cdev->ccwlock = sch->lock;
 
 	/* Init private data. */
@@ -1125,6 +1121,7 @@ io_subchannel_recog(struct ccw_device *cdev, struct subchannel *sch)
 
 	/* Start async. device sensing. */
 	spin_lock_irq(sch->lock);
+	sch_set_cdev(sch, cdev);
 	rc = ccw_device_recognition(cdev);
 	spin_unlock_irq(sch->lock);
 	if (rc) {