diff options
Diffstat (limited to 'drivers/s390/cio/device_fsm.c')
-rw-r--r-- | drivers/s390/cio/device_fsm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index 8df5eaafc5ab..87b4bfca080f 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c | |||
@@ -194,7 +194,7 @@ ccw_device_handle_oper(struct ccw_device *cdev) | |||
194 | cdev->id.dev_type != cdev->private->senseid.dev_type || | 194 | cdev->id.dev_type != cdev->private->senseid.dev_type || |
195 | cdev->id.dev_model != cdev->private->senseid.dev_model) { | 195 | cdev->id.dev_model != cdev->private->senseid.dev_model) { |
196 | PREPARE_WORK(&cdev->private->kick_work, | 196 | PREPARE_WORK(&cdev->private->kick_work, |
197 | ccw_device_do_unreg_rereg); | 197 | ccw_device_do_unbind_bind); |
198 | queue_work(ccw_device_work, &cdev->private->kick_work); | 198 | queue_work(ccw_device_work, &cdev->private->kick_work); |
199 | return 0; | 199 | return 0; |
200 | } | 200 | } |
@@ -366,7 +366,7 @@ static void ccw_device_oper_notify(struct ccw_device *cdev) | |||
366 | } | 366 | } |
367 | /* Driver doesn't want device back. */ | 367 | /* Driver doesn't want device back. */ |
368 | ccw_device_set_notoper(cdev); | 368 | ccw_device_set_notoper(cdev); |
369 | PREPARE_WORK(&cdev->private->kick_work, ccw_device_do_unreg_rereg); | 369 | PREPARE_WORK(&cdev->private->kick_work, ccw_device_do_unbind_bind); |
370 | queue_work(ccw_device_work, &cdev->private->kick_work); | 370 | queue_work(ccw_device_work, &cdev->private->kick_work); |
371 | } | 371 | } |
372 | 372 | ||
@@ -728,7 +728,7 @@ static void ccw_device_generic_notoper(struct ccw_device *cdev, | |||
728 | { | 728 | { |
729 | struct subchannel *sch; | 729 | struct subchannel *sch; |
730 | 730 | ||
731 | cdev->private->state = DEV_STATE_NOT_OPER; | 731 | ccw_device_set_notoper(cdev); |
732 | sch = to_subchannel(cdev->dev.parent); | 732 | sch = to_subchannel(cdev->dev.parent); |
733 | css_schedule_eval(sch->schid); | 733 | css_schedule_eval(sch->schid); |
734 | } | 734 | } |
@@ -1052,7 +1052,7 @@ ccw_device_offline_irq(struct ccw_device *cdev, enum dev_event dev_event) | |||
1052 | sch = to_subchannel(cdev->dev.parent); | 1052 | sch = to_subchannel(cdev->dev.parent); |
1053 | /* | 1053 | /* |
1054 | * An interrupt in state offline means a previous disable was not | 1054 | * An interrupt in state offline means a previous disable was not |
1055 | * successful. Try again. | 1055 | * successful - should not happen, but we try to disable again. |
1056 | */ | 1056 | */ |
1057 | cio_disable_subchannel(sch); | 1057 | cio_disable_subchannel(sch); |
1058 | } | 1058 | } |