diff options
| author | Andrei Danaila <adanaila@codeaurora.org> | 2015-02-18 17:10:28 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:11:12 -0700 |
| commit | 91fd0821459c7a8eb3eb0c26c1a53db01a8e0dfb (patch) | |
| tree | 0ac9e3f1663cbc801c1f443d14dc0c144a8c589a | |
| parent | 16afef100fab4ed8ac94d0af1521208497c90412 (diff) | |
mhi: core: Resolve static analysis issues
Address static analysis issues.
Change-Id: I21e1d05cab2e8899c105ae2bc81d85ec62ec7df7
Signed-off-by: Andrei Danaila <adanaila@codeaurora.org>
| -rw-r--r-- | drivers/platform/msm/mhi/mhi_init.c | 3 | ||||
| -rw-r--r-- | drivers/platform/msm/mhi/mhi_main.c | 13 |
2 files changed, 10 insertions, 6 deletions
diff --git a/drivers/platform/msm/mhi/mhi_init.c b/drivers/platform/msm/mhi/mhi_init.c index 19c673c57a15..0b9fb890e8c5 100644 --- a/drivers/platform/msm/mhi/mhi_init.c +++ b/drivers/platform/msm/mhi/mhi_init.c @@ -246,11 +246,12 @@ static enum MHI_STATUS mhi_init_device_ctrl(struct mhi_device_ctxt u32 align_len = sizeof(u64)*2; enum MHI_STATUS ret_val = MHI_STATUS_SUCCESS; - mhi_dev_ctxt->enable_lpm = 1; if (NULL == mhi_dev_ctxt || NULL == mhi_dev_ctxt->mhi_ctrl_seg_info || NULL == mhi_dev_ctxt->mhi_ctrl_seg_info->dev) return MHI_STATUS_ERROR; + mhi_dev_ctxt->enable_lpm = 1; + mhi_log(MHI_MSG_INFO, "Allocating control segment.\n"); ctrl_seg_size += sizeof(struct mhi_control_seg); /* Calculate the size of the control segment needed */ diff --git a/drivers/platform/msm/mhi/mhi_main.c b/drivers/platform/msm/mhi/mhi_main.c index 817937f6f156..faf066b482b5 100644 --- a/drivers/platform/msm/mhi/mhi_main.c +++ b/drivers/platform/msm/mhi/mhi_main.c @@ -277,8 +277,7 @@ enum MHI_STATUS mhi_register_channel(struct mhi_client_handle **client_handle, struct mhi_client_info_t *client_info, void *UserData) { enum MHI_STATUS ret_val = MHI_STATUS_SUCCESS; - struct mhi_device_ctxt *mhi_dev_ctxt = - &(mhi_devices.device_list[device_index].mhi_ctxt); + struct mhi_device_ctxt *mhi_dev_ctxt = NULL; if (!VALID_CHAN_NR(chan)) { ret_val = MHI_STATUS_INVALID_CHAN_ERR; @@ -289,6 +288,8 @@ enum MHI_STATUS mhi_register_channel(struct mhi_client_handle **client_handle, ret_val = MHI_STATUS_ERROR; goto error_handle; } + mhi_dev_ctxt = &(mhi_devices.device_list[device_index].mhi_ctxt); + if (NULL != mhi_dev_ctxt->client_handle_list[chan]) return MHI_STATUS_ALREADY_REGISTERED; @@ -1409,13 +1410,15 @@ int mhi_set_bus_request(struct mhi_device_ctxt *mhi_dev_ctxt, enum MHI_STATUS mhi_deregister_channel(struct mhi_client_handle *client_handle) { - if (NULL == client_handle || - client_handle->magic != MHI_HANDLE_MAGIC) + enum MHI_STATUS ret_val = MHI_STATUS_SUCCESS; + if (NULL == client_handle) return MHI_STATUS_ERROR; client_handle->mhi_dev_ctxt->client_handle_list[client_handle->chan] = NULL; + if (client_handle->magic != MHI_HANDLE_MAGIC) + ret_val = MHI_STATUS_ERROR; kfree(client_handle); - return MHI_STATUS_SUCCESS; + return ret_val; } EXPORT_SYMBOL(mhi_deregister_channel); |