Skip to content

Commit

Permalink
[S390] cio: handle failed disable_subchannel after device recognition
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sebastian Ott authored and Martin Schwidefsky committed Dec 7, 2009
1 parent 56e6b79 commit ec64333
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/s390/cio/device_fsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit ec64333

Please sign in to comment.