aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/device_fsm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/cio/device_fsm.c')
-rw-r--r--drivers/s390/cio/device_fsm.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 10bc03940fb3..01330cf5ae5e 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -399,9 +399,6 @@ ccw_device_done(struct ccw_device *cdev, int state)
399 ccw_device_oper_notify(cdev); 399 ccw_device_oper_notify(cdev);
400 } 400 }
401 wake_up(&cdev->private->wait_q); 401 wake_up(&cdev->private->wait_q);
402
403 if (css_init_done && state != DEV_STATE_ONLINE)
404 put_device (&cdev->dev);
405} 402}
406 403
407static int cmp_pgid(struct pgid *p1, struct pgid *p2) 404static int cmp_pgid(struct pgid *p1, struct pgid *p2)
@@ -611,8 +608,6 @@ ccw_device_online(struct ccw_device *cdev)
611 (cdev->private->state != DEV_STATE_BOXED)) 608 (cdev->private->state != DEV_STATE_BOXED))
612 return -EINVAL; 609 return -EINVAL;
613 sch = to_subchannel(cdev->dev.parent); 610 sch = to_subchannel(cdev->dev.parent);
614 if (css_init_done && !get_device(&cdev->dev))
615 return -ENODEV;
616 ret = cio_enable_subchannel(sch, (u32)(addr_t)sch); 611 ret = cio_enable_subchannel(sch, (u32)(addr_t)sch);
617 if (ret != 0) { 612 if (ret != 0) {
618 /* Couldn't enable the subchannel for i/o. Sick device. */ 613 /* Couldn't enable the subchannel for i/o. Sick device. */