aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/device_fsm.c
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2009-03-31 13:16:03 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-03-31 13:17:03 -0400
commit156013ffd1225ef862853a4340b46f76845f8db1 (patch)
tree0e6b202a111a483b9f44961508b3694dc0022df9 /drivers/s390/cio/device_fsm.c
parent33b26d7951619e4debf3a82f30a03423a36a1412 (diff)
[S390] cio: wake up on failed recognition
Wake up even on failed device recognition, since this may be triggered from a user trying to force a device online. With this patch a write to the online sysfs attribute will not block for ever but return with -EAGAIN in this case. 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 87b4bfca080f..ccd72f95765f 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -260,6 +260,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
260 if (state == DEV_STATE_NOT_OPER) { 260 if (state == DEV_STATE_NOT_OPER) {
261 cdev->private->flags.recog_done = 1; 261 cdev->private->flags.recog_done = 1;
262 cdev->private->state = DEV_STATE_DISCONNECTED; 262 cdev->private->state = DEV_STATE_DISCONNECTED;
263 wake_up(&cdev->private->wait_q);
263 return; 264 return;
264 } 265 }
265 /* Boxed devices don't need extra treatment. */ 266 /* Boxed devices don't need extra treatment. */
@@ -311,8 +312,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
311 } 312 }
312 cdev->private->state = state; 313 cdev->private->state = state;
313 io_subchannel_recog_done(cdev); 314 io_subchannel_recog_done(cdev);
314 if (state != DEV_STATE_NOT_OPER) 315 wake_up(&cdev->private->wait_q);
315 wake_up(&cdev->private->wait_q);
316} 316}
317 317
318/* 318/*