Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7d188b0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: msm: add uninterruptible flag in hab receiving for virtual reset."

parents 26a99498 29d1644d

drivers/clk/msm/virt-reset-front.c

+4 −3
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ static int virtrc_front_get_clk_id(struct reset_controller_dev *rcdev, 
		goto err_out;

	}



	ret = habmm_socket_recv(handle, &rsp, &rsp_size,

			UINT_MAX, 0);

	ret = habmm_socket_recv(handle, &rsp, &rsp_size, UINT_MAX,

			HABMM_SOCKET_RECV_FLAGS_UNINTERRUPTIBLE);

	if (ret) {

		pr_err("%s: habmm socket receive failed (%d)\n", map->clk_name,

				ret);
@@ -109,7 +109,8 @@ static int __virtrc_front_reset(struct reset_controller_dev *rcdev, 
		goto err_out;

	}



	ret = habmm_socket_recv(handle, &rsp, &rsp_size, UINT_MAX, 0);

	ret = habmm_socket_recv(handle, &rsp, &rsp_size, UINT_MAX,

			HABMM_SOCKET_RECV_FLAGS_UNINTERRUPTIBLE);

	if (ret) {

		pr_err("%s: habmm socket receive failed (%d)\n", map->clk_name,

				ret);