diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-02-17 22:40:54 +0100 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-02-17 22:40:54 +0100 |
commit | 859f7e45542aecaa77fde929232cbcf91b29e11d (patch) | |
tree | 5e81bbb0145bf2467e85ee8106734b4130f52ec0 /drivers/s390/cio/device.c | |
parent | perf report: Add "addr_from" and "addr_to" sort dimensions (diff) | |
parent | Merge tag 'drm-fixes-2022-02-18' of git://anongit.freedesktop.org/drm/drm (diff) | |
download | linux-859f7e45542aecaa77fde929232cbcf91b29e11d.tar.xz linux-859f7e45542aecaa77fde929232cbcf91b29e11d.zip |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes from perf/urgent that recently got merged.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/s390/cio/device.c')
-rw-r--r-- | drivers/s390/cio/device.c | 2 |
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; } |