From: Sebastian Ott Date: Mon, 7 Dec 2009 11:51:36 +0000 (+0100) Subject: [S390] cio: handle failed disable_subchannel after device recognition X-Git-Tag: MMI-PSA29.97-13-9~25715^2~49 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ec64333c3a9bc52e34d79cff23acf4e5764b1353;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [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 Signed-off-by: Martin Schwidefsky --- 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.