diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2008-12-25 13:39:14 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-12-25 13:39:10 +0100 |
| commit | f444cc0e52523560a8dfc12f5374e5d5ecf5375b (patch) | |
| tree | b2e9e3bf7ac0d15353cc8a26616a354e889370da /drivers/s390/cio | |
| parent | [S390] cio: introduce cio_commit_config (diff) | |
| download | linux-f444cc0e52523560a8dfc12f5374e5d5ecf5375b.tar.xz linux-f444cc0e52523560a8dfc12f5374e5d5ecf5375b.zip | |
[S390] cio: commit all pmcw changes.
Sometimes we change the pmcw configuration but don't call msch
to transmit these changes to the channel subsystem.
The patch fixes this by calling cio_commit_config in such cases.
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio')
| -rw-r--r-- | drivers/s390/cio/device.c | 6 | ||||
| -rw-r--r-- | drivers/s390/cio/device_fsm.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index d3127018fb81..6d714cf55064 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -1259,6 +1259,9 @@ static int io_subchannel_probe(struct subchannel *sch) return 0; } io_subchannel_init_fields(sch); + rc = cio_commit_config(sch); + if (rc) + goto out_schedule; rc = sysfs_create_group(&sch->dev.kobj, &io_subchannel_attr_group); if (rc) @@ -1722,6 +1725,9 @@ static int ccw_device_console_enable(struct ccw_device *cdev, sch->private = cio_get_console_priv(); memset(sch->private, 0, sizeof(struct io_subchannel_private)); io_subchannel_init_fields(sch); + rc = cio_commit_config(sch); + if (rc) + return rc; sch->driver = &io_subchannel_driver; /* Initialize the ccw_device structure. */ cdev->dev.parent= &sch->dev; diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index 9e249675c98d..8df5eaafc5ab 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c @@ -1031,6 +1031,8 @@ void ccw_device_trigger_reprobe(struct ccw_device *cdev) * paths are valid. */ io_subchannel_init_config(sch); + if (cio_commit_config(sch)) + return; /* We should also udate ssd info, but this has to wait. */ /* Check if this is another device which appeared on the same sch. */ |