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

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

Merge "qcom: scm: Be careful with side-effects from is_scm_armv8"

parents 4b372f58 7465c00c

drivers/soc/qcom/scm.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -640,6 +640,9 @@ int scm_call2(u32 fn_id, struct scm_desc *desc) 
	int ret, retry_count = 0;

	int ret, retry_count = 0;

	u64 x0;

	u64 x0;





	if (unlikely(!is_scm_armv8()))

		return -ENODEV;



	ret = allocate_extra_arg_buffer(desc, GFP_KERNEL);

	ret = allocate_extra_arg_buffer(desc, GFP_KERNEL);

	if (ret)

	if (ret)

		return ret;

		return ret;
@@ -708,6 +711,9 @@ int scm_call2_atomic(u32 fn_id, struct scm_desc *desc) 
	int ret;

	int ret;

	u64 x0;

	u64 x0;





	if (unlikely(!is_scm_armv8()))

		return -ENODEV;



	ret = allocate_extra_arg_buffer(desc, GFP_ATOMIC);

	ret = allocate_extra_arg_buffer(desc, GFP_ATOMIC);

	if (ret)

	if (ret)

		return ret;

		return ret;