aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/s390/cio/device.c3
-rw-r--r--drivers/s390/cio/device_fsm.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 7bb44e73ea9d..3b56f373da3a 100644
--- 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 *);
743static void sch_attach_device(struct subchannel *sch, 743static void sch_attach_device(struct subchannel *sch,
744 struct ccw_device *cdev) 744 struct ccw_device *cdev)
745{ 745{
746 css_update_ssd_info(sch);
746 spin_lock_irq(sch->lock); 747 spin_lock_irq(sch->lock);
747 sch->dev.driver_data = cdev; 748 sch->dev.driver_data = cdev;
748 cdev->private->schid = sch->schid; 749 cdev->private->schid = sch->schid;
@@ -878,7 +879,7 @@ io_subchannel_register(struct work_struct *work)
878 priv = container_of(work, struct ccw_device_private, kick_work); 879 priv = container_of(work, struct ccw_device_private, kick_work);
879 cdev = priv->cdev; 880 cdev = priv->cdev;
880 sch = to_subchannel(cdev->dev.parent); 881 sch = to_subchannel(cdev->dev.parent);
881 882 css_update_ssd_info(sch);
882 /* 883 /*
883 * io_subchannel_register() will also be called after device 884 * io_subchannel_register() will also be called after device
884 * recognition has been done for a boxed device (which will already 885 * 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 aadd2fd4a86c..898ec3b2bebb 100644
--- 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)
246 */ 246 */
247 old_lpm = sch->lpm; 247 old_lpm = sch->lpm;
248 stsch(sch->schid, &sch->schib); 248 stsch(sch->schid, &sch->schib);
249 css_update_ssd_info(sch);
250 sch->lpm = sch->schib.pmcw.pam & sch->opm; 249 sch->lpm = sch->schib.pmcw.pam & sch->opm;
251 /* Check since device may again have become not operational. */ 250 /* Check since device may again have become not operational. */
252 if (!sch->schib.pmcw.dnv) 251 if (!sch->schib.pmcw.dnv)