Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76cf2831 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 505d8968 846ad08f

soc/soundwire.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

soc/swr-wcd-ctrl.c

+2 −0
Original line number Diff line number Diff line
@@ -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);