diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2009-12-07 12:51:36 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2009-12-07 12:51:32 +0100 |
| commit | ec64333c3a9bc52e34d79cff23acf4e5764b1353 (patch) | |
| tree | 2792fbb48d7000cd7395d32e079badb46244c173 /drivers/s390/cio/device_fsm.c | |
| parent | 56e6b796fe9b99287648fc5686aae00106b37bab (diff) | |
| download | linux-ec64333c3a9bc52e34d79cff23acf4e5764b1353.tar.gz linux-ec64333c3a9bc52e34d79cff23acf4e5764b1353.tar.bz2 linux-ec64333c3a9bc52e34d79cff23acf4e5764b1353.zip | |
[S390] cio: handle failed disable_subchannel after device recognition
Handle a failing cio_disable_subchannel at the end of our device
recognition as if the recognition itself failed. This way
subsequent registration steps do not need to handle enabled
subchannels.
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/device_fsm.c')
| -rw-r--r-- | drivers/s390/cio/device_fsm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index 862b89ef3ee6..ae760658a131 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c @@ -229,7 +229,8 @@ ccw_device_recog_done(struct ccw_device *cdev, int state) sch = to_subchannel(cdev->dev.parent); - cio_disable_subchannel(sch); + if (cio_disable_subchannel(sch)) + state = DEV_STATE_NOT_OPER; /* * Now that we tried recognition, we have performed device selection * through ssch() and the path information is up to date. |