s390/cio: derive cdev information only for IO-subchannels

BugLink: https://bugs.launchpad.net/bugs/1980951
cdev->online for the purge function must not be checked for the
non-IO subchannel type. Make sure that we are deriving the cdev only
from sch-type SUBCHANNEL_TYPE_IO.

Signed-off-by: Vineeth Vijayan <vneethv@linux.ibm.com>
Reviewed-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
(cherry picked from commit 0c3812c347bfb0dc213556a195e79850c55702f5)
Signed-off-by: Frank Heimes <frank.heimes@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Luke Nowakowski-Krijger <luke.nowakowskikrijger@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index c27809792609384f923df47847c3a3a884606c18..ce9e7517430f7f6fe14160a40bcf3323ad895869 100644 (file)
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -792,10 +792,13 @@ static int __unset_online(struct device *dev, void *data)
 {
        struct idset *set = data;
        struct subchannel *sch = to_subchannel(dev);
-       struct ccw_device *cdev = sch_get_cdev(sch);
+       struct ccw_device *cdev;
 
-       if (cdev && cdev->online)
-               idset_sch_del(set, sch->schid);
+       if (sch->st == SUBCHANNEL_TYPE_IO) {
+               cdev = sch_get_cdev(sch);
+               if (cdev && cdev->online)
+                       idset_sch_del(set, sch->schid);
+       }
 
        return 0;
 }