Commit ec64333c authored Dec 07, 2009 by Sebastian Ott Committed by Martin Schwidefsky Dec 07, 2009

[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>

parent 56e6b796

drivers/s390/cio/device_fsm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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.