1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 07b1a074beaf..881bdfd99140 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1147,6 +1147,7 @@ err:
 static int io_subchannel_chp_event(struct subchannel *sch,
                                    struct chp_link *link, int event)
 {
+        struct ccw_device *cdev = sch_get_cdev(sch);
         int mask;
 
         mask = chp_ssd_get_mask(&sch->ssd_info, link);
@@ -1156,22 +1157,30 @@ static int io_subchannel_chp_event(struct subchannel *sch,
         case CHP_VARY_OFF:
                 sch->opm &= ~mask;
                 sch->lpm &= ~mask;
+                if (cdev)
+                        cdev->private->path_gone_mask |= mask;
                 io_subchannel_terminate_path(sch, mask);
                 break;
         case CHP_VARY_ON:
                 sch->opm |= mask;
                 sch->lpm |= mask;
+                if (cdev)
+                        cdev->private->path_new_mask |= mask;
                 io_subchannel_verify(sch);
                 break;
         case CHP_OFFLINE:
                 if (cio_update_schib(sch))
                         return -ENODEV;
+                if (cdev)
+                        cdev->private->path_gone_mask |= mask;
                 io_subchannel_terminate_path(sch, mask);
                 break;
         case CHP_ONLINE:
                 if (cio_update_schib(sch))
                         return -ENODEV;
                 sch->lpm |= mask & sch->opm;
+                if (cdev)
+                        cdev->private->path_new_mask |= mask;
                 io_subchannel_verify(sch);
                 break;
         }