diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-23 21:35:52 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-23 21:35:51 -0800 |
| commit | 970eca38013d367f11733813f1a195f8a2621b67 (patch) | |
| tree | 06539cdc197b013cfd7d1c01c09c48b678632ce8 /drivers/soc | |
| parent | 2dd610f4a0d62dec2eed2d9282201880eb1e2e07 (diff) | |
| parent | e54946be6ea8eb3afb0863f03b0ea203231ea51c (diff) | |
Merge "msm: mink: Separate out transport and client error"
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/smcinvoke.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/soc/qcom/smcinvoke.c b/drivers/soc/qcom/smcinvoke.c index d0fef9d31755..99ae24735f05 100644 --- a/drivers/soc/qcom/smcinvoke.c +++ b/drivers/soc/qcom/smcinvoke.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -207,12 +207,11 @@ static int prepare_send_scm_msg(const uint8_t *in_buf, size_t in_buf_len, ret = qseecom_process_listener_from_smcinvoke(&desc); *smcinvoke_result = (int32_t)desc.ret[1]; - if (ret || desc.ret[1] || desc.ret[2] || desc.ret[0]) { + if (ret || desc.ret[1] || desc.ret[2] || desc.ret[0]) pr_err("SCM call failed with ret val = %d %d %d %d\n", ret, (int)desc.ret[0], (int)desc.ret[1], (int)desc.ret[2]); - ret = ret | desc.ret[0] | desc.ret[1] | desc.ret[2]; - } + dmac_inv_range(in_buf, in_buf + inbuf_flush_size); dmac_inv_range(out_buf, out_buf + outbuf_flush_size); return ret; |