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

Merge "disp: msm: dp: retry the request to set USB mode during bootup"

qctecmdr 3 жил өмнө
parent
commit
9acf478553

+ 2 - 2
msm/dp/dp_altmode.c

@@ -43,7 +43,7 @@ enum dp_altmode_pin_assignment {
 
 
 static int dp_altmode_set_usb_dp_mode(struct dp_altmode_private *altmode)
 static int dp_altmode_set_usb_dp_mode(struct dp_altmode_private *altmode)
 {
 {
-	int rc;
+	int rc = 0;
 	struct device_node *np;
 	struct device_node *np;
 	struct device_node *usb_node;
 	struct device_node *usb_node;
 	struct platform_device *usb_pdev;
 	struct platform_device *usb_pdev;
@@ -71,7 +71,7 @@ static int dp_altmode_set_usb_dp_mode(struct dp_altmode_private *altmode)
 
 
 	while (timeout) {
 	while (timeout) {
 		rc = dwc3_msm_set_dp_mode(&usb_pdev->dev, altmode->connected, altmode->lanes);
 		rc = dwc3_msm_set_dp_mode(&usb_pdev->dev, altmode->connected, altmode->lanes);
-		if (rc != -EBUSY)
+		if (rc != -EBUSY && rc != -EAGAIN)
 			break;
 			break;
 
 
 		DP_WARN("USB busy, retry\n");
 		DP_WARN("USB busy, retry\n");