3 files changed, 5 insertions, 3 deletions

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 4a9da5bdd535..b00f3ed051a0 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -244,8 +244,7 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
 
         if ((sch->schib.scsw.actl & SCSW_ACTL_DEVACT) &&
             (sch->schib.scsw.actl & SCSW_ACTL_SCHACT) &&
-            (sch->schib.pmcw.lpum == mask) &&
-            (sch->vpm == 0)) {
+            (sch->schib.pmcw.lpum == mask)) {
                 int cc;
 
                 cc = cio_clear(sch);
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 49ec562d7f60..5ec8ef1df9fa 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -861,6 +861,8 @@ ccw_device_clear_verify(struct ccw_device *cdev, enum dev_event dev_event)
         irb = (struct irb *) __LC_IRB;
         /* Accumulate status. We don't do basic sense. */
         ccw_device_accumulate_irb(cdev, irb);
+        /* Remember to clear irb to avoid residuals. */
+        memset(&cdev->private->irb, 0, sizeof(struct irb));
         /* Try to start delayed device verification. */
         ccw_device_online_verify(cdev, 0);
         /* Note: Don't call handler for cio initiated clear! */
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 5c9904b418e1..b266ad8e14ff 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -78,7 +78,8 @@ ccw_device_start_key(struct ccw_device *cdev, struct ccw1 *cpa,
                 return -ENODEV;
         if (cdev->private->state == DEV_STATE_NOT_OPER)
                 return -ENODEV;
-        if (cdev->private->state == DEV_STATE_VERIFY) {
+        if (cdev->private->state == DEV_STATE_VERIFY ||
+            cdev->private->state == DEV_STATE_CLEAR_VERIFY) {
                 /* Remember to fake irb when finished. */
                 if (!cdev->private->flags.fake_irb) {
                         cdev->private->flags.fake_irb = 1;