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

Commit fe9f34a9 authored by Mohit Sharma's avatar Mohit Sharma
Browse files

Diff patch b/w mainline and release branch. 



Change-Id: I19fb8a61c14e4baf62254abe6393d7126c0658b3
Signed-off-by: default avatarMohit Sharma <smohit@codeaurora.org>
parent a7e0337c

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_core.c

+0 −6
Original line number Diff line number Diff line
@@ -2910,12 +2910,6 @@ static int syna_tcm_resume(struct device *dev) 
				"Failed to enable regulators\n");

	}



	retval = syna_tcm_enable_regulator(tcm_hcd, true);

	if (retval < 0) {

		LOGE(tcm_hcd->pdev->dev.parent,

				"Failed to enable regulators\n");

	}



	retval = pinctrl_select_state(

			tcm_hcd->ts_pinctrl,

			tcm_hcd->pinctrl_state_active);

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

+0 −28
Original line number Diff line number Diff line
@@ -6611,34 +6611,6 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
			strlen(resource_p->uc_fw_file_name));

	}



	if (resource_p->gsi_fw_file_name) {

		ipa3_ctx->gsi_fw_file_name =

			kzalloc(((strlen(resource_p->gsi_fw_file_name)+1) *

				sizeof(const char)), GFP_KERNEL);

		if (ipa3_ctx->gsi_fw_file_name == NULL) {

			IPAERR_RL("Failed to alloc GSI FW file name\n");

			result = -ENOMEM;

			goto fail_gsi_file_alloc;

		}

		memcpy(ipa3_ctx->gsi_fw_file_name,

				(void const *)resource_p->gsi_fw_file_name,

				strlen(resource_p->gsi_fw_file_name));

	}



	if (resource_p->uc_fw_file_name) {

		ipa3_ctx->uc_fw_file_name =

			kzalloc(((strlen(resource_p->uc_fw_file_name)+1) *

				sizeof(const char)), GFP_KERNEL);

		if (ipa3_ctx->uc_fw_file_name == NULL) {

			IPAERR_RL("Failed to alloc uC FW file name\n");

			result = -ENOMEM;

			goto fail_uc_file_alloc;

		}

		memcpy(ipa3_ctx->uc_fw_file_name,

			(void const *)resource_p->uc_fw_file_name,

			strlen(resource_p->uc_fw_file_name));

	}



	if (ipa3_ctx->secure_debug_check_action == USE_SCM) {

		if (ipa_is_mem_dump_allowed())

			ipa3_ctx->sd_state = SD_ENABLED;