mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 15:11:48 -04:00
Merge "soc: soundwire: Fix wsa mute issue for stereo playback"
This commit is contained in:
commit
76cf2831d9
2 changed files with 3 additions and 1 deletions
|
|
@ -245,7 +245,7 @@ int swr_remove_from_group(struct swr_device *dev, u8 dev_num)
|
|||
if (!dev->group_id)
|
||||
return 0;
|
||||
|
||||
if (master->gr_sid == dev_num)
|
||||
if (master->gr_sid != dev_num)
|
||||
return 0;
|
||||
|
||||
if (master->remove_from_group && master->remove_from_group(master))
|
||||
|
|
|
|||
|
|
@ -1790,6 +1790,8 @@ int swrm_wcd_notify(struct platform_device *pdev, u32 id, void *data)
|
|||
(swrm->state == SWR_MSTR_UP)) {
|
||||
dev_dbg(swrm->dev, "%s: SWR master is already UP: %d\n",
|
||||
__func__, swrm->state);
|
||||
list_for_each_entry(swr_dev, &mstr->devices, dev_list)
|
||||
swr_reset_device(swr_dev);
|
||||
} else {
|
||||
pm_runtime_mark_last_busy(&pdev->dev);
|
||||
mutex_unlock(&swrm->reslock);
|
||||
|
|
|
|||
Loading…
Reference in a new issue