Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'soundwire-6.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire
Pull soundwire fixes from Vinod Koul:
- Null pointer dereference for mult link in core
- AC timing fix in intel driver
* tag 'soundwire-6.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
soundwire: intel_ace2x: fix AC timing setting for ACE2.x
soundwire: stream: fix NULL pointer dereference for multi_link
+6
-4
+2
-1
drivers/soundwire/intel_ace2x.c
+2
-1
drivers/soundwire/intel_ace2x.c
···
23
23
static void intel_shim_vs_init(struct sdw_intel *sdw)
24
24
{
25
25
void __iomem *shim_vs = sdw->link_res->shim_vs;
26
-
u16 act = 0;
26
+
u16 act;
27
27
28
+
act = intel_readw(shim_vs, SDW_SHIM2_INTEL_VS_ACTMCTL);
28
29
u16p_replace_bits(&act, 0x1, SDW_SHIM2_INTEL_VS_ACTMCTL_DOAIS);
29
30
act |= SDW_SHIM2_INTEL_VS_ACTMCTL_DACTQE;
30
31
act |= SDW_SHIM2_INTEL_VS_ACTMCTL_DODS;
+4
-3
drivers/soundwire/stream.c
+4
-3
drivers/soundwire/stream.c
···
742
742
* sdw_ml_sync_bank_switch: Multilink register bank switch
743
743
*
744
744
* @bus: SDW bus instance
745
+
* @multi_link: whether this is a multi-link stream with hardware-based sync
745
746
*
746
747
* Caller function should free the buffers on error
747
748
*/
748
-
static int sdw_ml_sync_bank_switch(struct sdw_bus *bus)
749
+
static int sdw_ml_sync_bank_switch(struct sdw_bus *bus, bool multi_link)
749
750
{
750
751
unsigned long time_left;
751
752
752
-
if (!bus->multi_link)
753
+
if (!multi_link)
753
754
return 0;
754
755
755
756
/* Wait for completion of transfer */
···
848
847
bus->bank_switch_timeout = DEFAULT_BANK_SWITCH_TIMEOUT;
849
848
850
849
/* Check if bank switch was successful */
851
-
ret = sdw_ml_sync_bank_switch(bus);
850
+
ret = sdw_ml_sync_bank_switch(bus, multi_link);
852
851
if (ret < 0) {
853
852
dev_err(bus->dev,
854
853
"multi link bank switch failed: %d\n", ret);