summaryrefslogtreecommitdiff
path: root/drivers/s390
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2022-03-01 23:02:48 +0300
committerVasily Gorbik <gor@linux.ibm.com>2022-03-01 23:02:48 +0300
commit9a4f03ad6d67b63e7d2a3fe16c30511f5fb80040 (patch)
tree7766b8d6ce6edc309ddba6c9740a782bfe8d2192 /drivers/s390
parentf413f685c6c094a7b968f66ca2e8512720807203 (diff)
parentc194dad21025dfd043210912653baab823bdff67 (diff)
downloadlinux-9a4f03ad6d67b63e7d2a3fe16c30511f5fb80040.tar.xz
Merge branch 'fixes' into features
This helps to avoid several merge conflicts later. * fixes: s390/extable: fix exception table sorting s390/ftrace: fix arch_ftrace_get_regs implementation s390/ftrace: fix ftrace_caller/ftrace_regs_caller generation s390/setup: preserve memory at OLDMEM_BASE and OLDMEM_SIZE s390/cio: verify the driver availability for path_event call s390/module: fix building test_modules_helpers.o with clang MAINTAINERS: downgrade myself to Reviewer for s390 MAINTAINERS: add Alexander Gordeev as maintainer for s390 Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/cio/device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index cd938a26b76c..3b1cd0c96a74 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1180,7 +1180,7 @@ static int io_subchannel_chp_event(struct subchannel *sch,
else
path_event[chpid] = PE_NONE;
}
- if (cdev)
+ if (cdev && cdev->drv && cdev->drv->path_event)
cdev->drv->path_event(cdev, path_event);
break;
}