Merge "soc: soundwire: Fix wsa mute issue for stereo playback"

This commit is contained in:
Linux Build Service Account 2018-08-10 10:24:46 -07:00 • committed by Gerrit - the friendly Code Review server
commit 76cf2831d9
2 changed files with 3 additions and 1 deletions

View file

@ -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))

View file

@ -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);