Merge "soundwire: call startup function for remaining slave init" (82312b02) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/soundwire/swr-wcd-ctrl.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -953,6 +953,7 @@ static int swrm_probe(struct platform_device *pdev)
		{
		struct swr_mstr_ctrl *swrm;
		struct swr_ctrl_platform_data *pdata;
		struct swr_device swr_dev, safe;
		int ret;

		/* Allocate soundwire master driver structure */
		@@ -1059,6 +1060,14 @@ static int swrm_probe(struct platform_device *pdev)
		mutex_unlock(&swrm->mlock);
		goto err_mstr_fail;
		}

		/* Enumerate slave devices */
		list_for_each_entry_safe(swr_dev, safe, &swrm->master.devices,
		dev_list) {
		ret = swr_startup_devices(swr_dev);
		if (ret)
		list_del(&swr_dev->dev_list);
		}
		mutex_unlock(&swrm->mlock);

		dbgswrm = swrm;