diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-18 09:44:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-18 09:44:50 -0700 |
| commit | 727593cbf7ebb6782b2b3b45a951cc8ccc03a788 (patch) | |
| tree | f07fb219560480ed32c63035a5b5b2f323e8abff | |
| parent | 79d712a8a438a356ace70baea3471774f8bc070f (diff) | |
| parent | 5a586db95cbf78cad11c00651700a98fb37032a7 (diff) | |
Merge "drivers: soc: qcom: qcpe: Fix return values"
| -rw-r--r-- | drivers/soc/qcom/scm_qcpe.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/soc/qcom/scm_qcpe.c b/drivers/soc/qcom/scm_qcpe.c index 614670888aac..f9a593ceefc7 100644 --- a/drivers/soc/qcom/scm_qcpe.c +++ b/drivers/soc/qcom/scm_qcpe.c @@ -723,7 +723,7 @@ bool is_scm_armv8(void) ret = scm_call_qcpe(x0 | SMC64_MASK, &desc); - ret1 = desc.arginfo; + ret1 = desc.ret[0]; if (ret || !ret1) { /* Try SMC32 call */ @@ -1009,7 +1009,7 @@ s32 scm_call_atomic1_1(u32 svc, u32 cmd, u32 arg1, u32 *ret1) if (ret < 0) return scm_remap_error(ret); - *ret1 = desc.arginfo; + *ret1 = desc.ret[0]; return 0; } @@ -1117,8 +1117,8 @@ s32 scm_call_atomic4_3(u32 svc, u32 cmd, u32 arg1, u32 arg2, if (ret < 0) return scm_remap_error(ret); - *ret1 = desc.arginfo; - *ret2 = desc.args[0]; + *ret1 = desc.ret[0]; + *ret2 = desc.ret[1]; return 0; } @@ -1169,9 +1169,9 @@ s32 scm_call_atomic5_3(u32 svc, u32 cmd, u32 arg1, u32 arg2, if (ret < 0) return scm_remap_error(ret); - *ret1 = desc.arginfo; - *ret2 = desc.args[0]; - *ret3 = desc.args[1]; + *ret1 = desc.ret[0]; + *ret2 = desc.ret[1]; + *ret3 = desc.ret[2]; return 0; } @@ -1201,7 +1201,7 @@ u32 scm_get_version(void) ret = scm_call_qcpe(x0, &desc); - version = desc.arginfo; + version = desc.ret[0]; mutex_unlock(&scm_lock); |