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

Commit 168b2d55 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: Fix uninitialized variables access" into msm-4.9

parents 152b7722 95e98307

drivers/platform/msm/ipa/ipa_v3/ipa_client.c

+2 −1
Original line number Diff line number Diff line
@@ -1776,7 +1776,8 @@ int ipa3_release_gsi_channel(u32 clnt_hdl) 
int ipa3_xdci_suspend(u32 ul_clnt_hdl, u32 dl_clnt_hdl,

	bool should_force_clear, u32 qmi_req_id, bool is_dpl)

{

	struct ipa3_ep_context *ul_ep, *dl_ep;

	struct ipa3_ep_context *ul_ep = NULL;

	struct ipa3_ep_context *dl_ep;

	int result = -EFAULT;

	u32 source_pipe_bitmask = 0;

	bool dl_data_pending = true;

drivers/platform/msm/ipa/ipa_v3/ipa_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ int ipa3_send_one(struct ipa3_sys_context *sys, struct ipa3_desc *desc, 
	int result;

	u16 sps_flags = SPS_IOVEC_FLAG_EOT;

	dma_addr_t dma_address;

	u16 len;

	u16 len = 0;

	u32 mem_flag = GFP_ATOMIC;



	if (unlikely(!in_atomic))

drivers/platform/msm/ipa/ipa_v3/ipa_uc.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-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
@@ -498,7 +498,7 @@ static int ipa3_uc_send_cmd_64b_param(u32 cmd_lo, u32 cmd_hi, u32 opcode, 
{

	int index;

	union IpaHwCpuCmdCompletedResponseData_t uc_rsp;

	unsigned long flags;

	unsigned long flags = 0;

	int retries = 0;



send_cmd_lock:
@@ -775,7 +775,7 @@ int ipa3_uc_send_cmd(u32 cmd, u32 opcode, u32 expected_status, 
void ipa3_uc_register_handlers(enum ipa3_hw_features feature,

			      struct ipa3_uc_hdlrs *hdlrs)

{

	unsigned long flags;

	unsigned long flags = 0;



	if (0 > feature || IPA_HW_FEATURE_MAX <= feature) {

		IPAERR("Feature %u is invalid, not registering hdlrs\n",