diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-06-19 22:04:18 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-06-19 22:04:18 -0700 |
| commit | 2386158c7be40e15d74aab3d18a54001047f0442 (patch) | |
| tree | 2c988f46b09bb22f6a5cf2a4f4d74b218ce4a7d0 | |
| parent | 9cc0ccd7af0cdcbb9757e44fdc43b41860100bb9 (diff) | |
| parent | 3a1f559efad27889f1df74db744e4f4333524ec1 (diff) | |
Merge "soc: qcom: hab: clean the compilation issues"
| -rw-r--r-- | drivers/soc/qcom/hab/ghs_comm.c | 2 | ||||
| -rw-r--r-- | drivers/soc/qcom/hab/hab_ghs.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/soc/qcom/hab/ghs_comm.c b/drivers/soc/qcom/hab/ghs_comm.c index 97d43f4c2667..825f33a23858 100644 --- a/drivers/soc/qcom/hab/ghs_comm.c +++ b/drivers/soc/qcom/hab/ghs_comm.c @@ -129,7 +129,7 @@ void physical_channel_rx_dispatch(unsigned long physical_channel) /* no more pending msg */ break; } - pr_error("recv unhandled result %d, size %zd\n", + pr_err("recv unhandled result %d, size %zd\n", result, dev->read_size); break; } diff --git a/drivers/soc/qcom/hab/hab_ghs.c b/drivers/soc/qcom/hab/hab_ghs.c index 859f47f3ed59..11fd6bb92a90 100644 --- a/drivers/soc/qcom/hab/hab_ghs.c +++ b/drivers/soc/qcom/hab/hab_ghs.c @@ -184,9 +184,6 @@ int habhyp_commdev_dealloc(void *commdev) struct ghs_vdev *dev = pchan->hyp_data; kgipc_endpoint_free(dev->endpoint); - - spin_lock_destroy(&dev->io_lock); - kfree(dev->read_data); kfree(dev); |