Эх сурвалжийг харах

Merge 0d143ad36ab84b1c2f527509fb5950b64e55987c on remote branch

Change-Id: I022892b75713d8f11a8971d890d7a06d31a96c1e
Linux Build Service Account 1 жил өмнө
parent
commit
b5053c761f

+ 2 - 1
asoc/pineapple.c

@@ -2472,7 +2472,8 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
 	dev_info(&pdev->dev, "%s: Sound card %s registered\n",
 	dev_info(&pdev->dev, "%s: Sound card %s registered\n",
 		 __func__, card->name);
 		 __func__, card->name);
 
 
-	if (wcd_mbhc_cfg.enable_usbc_analog)
+	if (wcd_mbhc_cfg.enable_usbc_analog ||
+		wcd_mbhc_cfg.usbss_hsj_connect_enable)
 		wcd_mbhc_cfg.swap_gnd_mic = msm_usbc_swap_gnd_mic;
 		wcd_mbhc_cfg.swap_gnd_mic = msm_usbc_swap_gnd_mic;
 
 
 	pdata->fsa_handle = of_parse_phandle(pdev->dev.of_node,
 	pdata->fsa_handle = of_parse_phandle(pdev->dev.of_node,