[S390] cio: Dont call css_update_ssd_info from interrupt context.

Signed-off-by: Cornelia Huck <cornelia.huck@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 7bb44e73ea9d8af83728e3bee3119c1314c053bd..3b56f373da3ae7fbdd4205a8d492451ab390f6f6 100644 (file)
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -743,6 +743,7 @@ static int io_subchannel_recog(struct ccw_device *, struct subchannel *);
 static void sch_attach_device(struct subchannel *sch,
                              struct ccw_device *cdev)
 {
+       css_update_ssd_info(sch);
        spin_lock_irq(sch->lock);
        sch->dev.driver_data = cdev;
        cdev->private->schid = sch->schid;
@@ -878,7 +879,7 @@ io_subchannel_register(struct work_struct *work)
        priv = container_of(work, struct ccw_device_private, kick_work);
        cdev = priv->cdev;
        sch = to_subchannel(cdev->dev.parent);
-
+       css_update_ssd_info(sch);
        /*
         * io_subchannel_register() will also be called after device
         * recognition has been done for a boxed device (which will already

diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index aadd2fd4a86ce367404b02c9c7225eae0e5b5eae..898ec3b2bebb5092c123030504c69aae89b89886 100644 (file)
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -246,7 +246,6 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
         */
        old_lpm = sch->lpm;
        stsch(sch->schid, &sch->schib);
-       css_update_ssd_info(sch);
        sch->lpm = sch->schib.pmcw.pam & sch->opm;
        /* Check since device may again have become not operational. */
        if (!sch->schib.pmcw.dnv)