Merge "soc: qcom: rpm-smd: Move timeout for rpm ack error message" (2198278e) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/soc/qcom/rpm-smd.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -547,10 +547,8 @@ static int msm_rpm_read_sleep_ack(void)
	* spinlock from being locked out.		* spinlock from being locked out.
	*/		*/

	if (!timeout) {		if (!timeout)
	pr_err("Timed out waiting for RPM ACK\n");
	return -EAGAIN;		return -EAGAIN;
	}

	ret = msm_rpm_read_smd_data(buf);		ret = msm_rpm_read_smd_data(buf);
	if (!ret)		if (!ret)
	@@ -604,10 +602,12 @@ static int msm_rpm_flush_requests(bool print)

	if (ret >= 0)		if (ret >= 0)
	count--;		count--;
	else		else {
			pr_err("Timed out waiting for RPM ACK\n");
	return ret;		return ret;
	}		}
	}		}
			}
	return 0;		return 0;
	}		}