Merge "ipa: Fix MHI channel resume after stuck GSI"

drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c

@@ -1496,8 +1496,8 @@ static int ipa_mhi_resume_channels(bool LPTransitionRejected,
 	for (i = 0; i < max_channels; i++) {
 		if (!channels[i].valid)
 			continue;
-		if (channels[i].state !=
-		    IPA_HW_MHI_CHANNEL_STATE_SUSPEND)
+		if (channels[i].state != IPA_HW_MHI_CHANNEL_STATE_SUSPEND &&
+		    !channels[i].stop_in_proc)
 			continue;
 		channel = &channels[i];
 		IPA_MHI_DBG("resuming channel %d\n", channel->id);

drivers/platform/msm/ipa/ipa_v3/ipa_utils.c

@@ -8423,7 +8423,7 @@ static int __ipa3_stop_gsi_channel(u32 clnt_hdl)
 	}
 
 	IPAERR("Failed  to stop GSI channel with retries\n");
-	return -EFAULT;
+	return res;
 }
 
 /**