diff options
| author | Thomas Gleixner <[email protected]> | 2025-07-09 09:51:34 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2025-07-09 09:51:34 +0000 |
| commit | 068f7b64bf2054e20bbbd0782aa11f6ff8d17105 (patch) | |
| tree | f9f88dfe79f4be4789480dc22f74908b3484a8f8 /drivers/spi/spi-offload.c | |
| parent | timekeeping: Remove the temporary CLOCK_AUX workaround (diff) | |
| parent | Linux 6.16-rc2 (diff) | |
| download | kernel-068f7b64bf2054e20bbbd0782aa11f6ff8d17105.tar.gz kernel-068f7b64bf2054e20bbbd0782aa11f6ff8d17105.zip | |
Merge v6.16-rc2 into timers/ptp
to pick up the __GENMASK() fix, otherwise the AUX clock VDSO patches fail
to compile for compat.
Signed-off-by: Thomas Gleixner <[email protected]>
Diffstat (limited to 'drivers/spi/spi-offload.c')
| -rw-r--r-- | drivers/spi/spi-offload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-offload.c b/drivers/spi/spi-offload.c index e674097bf3be..d336f4d228d5 100644 --- a/drivers/spi/spi-offload.c +++ b/drivers/spi/spi-offload.c @@ -297,7 +297,7 @@ int spi_offload_trigger_enable(struct spi_offload *offload, if (trigger->ops->enable) { ret = trigger->ops->enable(trigger, config); if (ret) { - if (offload->ops->trigger_disable) + if (offload->ops && offload->ops->trigger_disable) offload->ops->trigger_disable(offload); return ret; } |