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

Commit 6dfb453e authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge d9e397cf on remote branch 

Change-Id: I4dc848b3de871700e64bb95a80f56edf9992d830
parents 1c9a9f84 d9e397cf

drivers/media/platform/msm/camera/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

+5 −4
Original line number Diff line number Diff line
@@ -721,10 +721,11 @@ static int cam_jpeg_mgr_prepare_hw_update(void *hw_mgr_priv, 
	}



	if ((packet->num_cmd_buf > 5) || !packet->num_patches ||

		!packet->num_io_configs) {

		CAM_ERR(CAM_JPEG, "wrong number of cmd/patch info: %u %u",

			packet->num_cmd_buf,

			packet->num_patches);

		!packet->num_io_configs ||

		(packet->num_io_configs > CAM_JPEG_IMAGE_MAX)) {

		CAM_ERR(CAM_JPEG, "wrong number of cmd/patch info: %u %u %u",

			packet->num_cmd_buf, packet->num_patches,

			packet->num_io_configs);

		return -EINVAL;

	}

drivers/platform/msm/ipa/ipa_clients/ipa_uc_offload.c

+3 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ static int ipa_uc_ntn_alloc_conn_smmu_info(struct ipa_ntn_setup_info *dest, 
		source->buff_pool_base_sgt);

	if (result) {

		kfree(dest->data_buff_list);

		dest->data_buff_list = NULL;

		return result;

	}
@@ -435,6 +436,7 @@ static int ipa_uc_ntn_alloc_conn_smmu_info(struct ipa_ntn_setup_info *dest, 
		source->ring_base_sgt);

	if (result) {

		kfree(dest->data_buff_list);

		dest->data_buff_list = NULL;

		ipa_smmu_free_sgt(&dest->buff_pool_base_sgt);

		return result;

	}
@@ -445,6 +447,7 @@ static int ipa_uc_ntn_alloc_conn_smmu_info(struct ipa_ntn_setup_info *dest, 
static void ipa_uc_ntn_free_conn_smmu_info(struct ipa_ntn_setup_info *params)

{

	kfree(params->data_buff_list);

	params->data_buff_list = NULL;

	ipa_smmu_free_sgt(&params->buff_pool_base_sgt);

	ipa_smmu_free_sgt(&params->ring_base_sgt);

}

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

+4 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ static void ipa3_active_clients_log_destroy(void) 
	kfree(active_clients_table_buf);

	active_clients_table_buf = NULL;

	kfree(ipa3_ctx->ipa3_active_clients_logging.log_buffer[0]);

	ipa3_ctx->ipa3_active_clients_logging.log_buffer[0] = NULL;

	ipa3_ctx->ipa3_active_clients_logging.log_head = 0;

	ipa3_ctx->ipa3_active_clients_logging.log_tail =

			IPA3_ACTIVE_CLIENTS_LOG_BUFFER_SIZE_LINES - 1;
@@ -5861,8 +5862,10 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
fail_init_mem_partition:

fail_bind:

	kfree(ipa3_ctx->ctrl);

	ipa3_ctx->ctrl = NULL;

fail_mem_ctrl:

	kfree(ipa3_ctx->ipa_tz_unlock_reg);

	ipa3_ctx->ipa_tz_unlock_reg = NULL;

fail_tz_unlock_reg:

	if (ipa3_ctx->logbuf)

		ipc_log_context_destroy(ipa3_ctx->logbuf);
@@ -6240,6 +6243,7 @@ static int get_ipa_dts_configuration(struct platform_device *pdev, 
			IPAERR("failed to read register addresses\n");

			kfree(ipa_tz_unlock_reg);

			kfree(ipa_drv_res->ipa_tz_unlock_reg);

			ipa_drv_res->ipa_tz_unlock_reg = NULL;

			return -EFAULT;

		}

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

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ static int __ipa_del_flt_rule(u32 rule_hdl) 


	list_del(&entry->link);

	entry->tbl->rule_cnt--;

	if (entry->rt_tbl)

	if (entry->rt_tbl && !ipa3_check_idr_if_freed(entry->rt_tbl))

		entry->rt_tbl->ref_cnt--;

	IPADBG("del flt rule rule_cnt=%d rule_id=%d\n",

		entry->tbl->rule_cnt, entry->rule_id);

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

+1 −0
Original line number Diff line number Diff line
@@ -617,6 +617,7 @@ int ipa_pm_init(struct ipa_pm_init_params *params) 
	if (!ipa_pm_ctx->wq) {

		IPA_PM_ERR("create workqueue failed\n");

		kfree(ipa_pm_ctx);

		ipa_pm_ctx = NULL;

		return -ENOMEM;

	}