diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-23 23:00:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-23 23:00:46 +0200 |
| commit | 7116747a686e3d5decc354e6812f078dd0c44c6e (patch) | |
| tree | 84e5d8a5208594aeaa4c1022040a4c2cf4296cd3 /drivers/soundwire/intel_auxdevice.c | |
| parent | Merge tag 'linux-watchdog-6.12-rc1' of git://www.linux-watchdog.org/linux-wat... (diff) | |
| parent | soundwire: intel_bus_common: enable interrupts before exiting reset (diff) | |
| download | linux-7116747a686e3d5decc354e6812f078dd0c44c6e.tar.xz linux-7116747a686e3d5decc354e6812f078dd0c44c6e.zip | |
Merge tag 'soundwire-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire
Pull soundwire updates from Vinod Koul:
- bus cleanup for warnings and probe deferral errors suppression
- cadence recheck for status with a delayed work
- intel interrupt rework on reset exit
* tag 'soundwire-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
soundwire: intel_bus_common: enable interrupts before exiting reset
soundwire: cadence: re-check Peripheral status with delayed_work
soundwire: bus: clean up probe warnings
soundwire: bus: drop unused driver name field
soundwire: bus: suppress probe deferral errors
Diffstat (limited to 'drivers/soundwire/intel_auxdevice.c')
| -rw-r--r-- | drivers/soundwire/intel_auxdevice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soundwire/intel_auxdevice.c b/drivers/soundwire/intel_auxdevice.c index d110f2b587d5..ae689d5d1ab9 100644 --- a/drivers/soundwire/intel_auxdevice.c +++ b/drivers/soundwire/intel_auxdevice.c @@ -489,6 +489,7 @@ static void intel_link_remove(struct auxiliary_device *auxdev) */ if (!bus->prop.hw_disabled) { sdw_intel_debugfs_exit(sdw); + cancel_delayed_work_sync(&cdns->attach_dwork); sdw_cdns_enable_interrupt(cdns, false); } sdw_bus_master_delete(bus); |