[S390] cio: fix repeat setting of cdev parent association

sch_create_and_recog_new_device() associates a parent subchannel
with its ccw device child even though this is already done by
the subsequently called io_subchannel_recog(). Also make sure
io_subchannel_recog() sets the association under lock.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 55f997308e42bf713ea01b7773139d9fd12d035d..0efecefdb83ae2e93eaabe9209847d41a4c345f1 100644 (file)
--- a/drivers/s390/cio/device.c
+++ b/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) {