diff options
author | Stephen Boyd <sboyd@kernel.org> | 2022-03-15 14:06:06 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2022-03-15 14:06:06 -0700 |
commit | 99105cc81885e1278c927cdff15a3fdef5c29289 (patch) | |
tree | c48ea12335dc9006df715a05433f3f19a3570ff7 /drivers/s390/cio/device.c | |
parent | ed06099c5d0b329082cc19c58eace0b20bf7fe70 (diff) | |
parent | 754e0b0e35608ed5206d6a67a791563c631cec07 (diff) |
Merge tag 'v5.17-rc4' into clk-ti
We want to get commit 31aa7056bbec ("ARM: dts: Don't use legacy clock
defines for dra7 clkctrl") so merge in the nearest rc.
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; } |