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

Commit 2ee4c9a2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fbdev: msm: Fix unintialisation of variables"

parents 4108a4b1 2fbcda98

drivers/video/msm/mdss/mdss_dba_utils.c

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

/* Copyright (c) 2015-2018, 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
@@ -734,7 +734,6 @@ void *mdss_dba_utils_init(struct mdss_dba_utils_init_data *uid) 
	struct mdss_dba_utils_data *udata = NULL;

	struct msm_dba_reg_info info;

	struct cec_abstract_init_data cec_abst_init_data;

	void *cec_abst_data;

	int ret = 0;



	if (!uid) {
@@ -823,7 +822,7 @@ void *mdss_dba_utils_init(struct mdss_dba_utils_init_data *uid) 
	udata->cec_abst_data = cec_abstract_init(&cec_abst_init_data);

	if (IS_ERR_OR_NULL(udata->cec_abst_data)) {

		pr_err("error initializing cec abstract module\n");

		ret = PTR_ERR(cec_abst_data);

		ret = PTR_ERR(udata->cec_abst_data);

		goto error;

	}

drivers/video/msm/mdss/mdss_mdp.c

+2 −2
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ void mdss_mdp_irq_clear(struct mdss_data_type *mdata, 


int mdss_mdp_irq_enable(u32 intr_type, u32 intf_num)

{

	int irq_idx, idx;

	int irq_idx = 0;

	unsigned long irq_flags;

	int ret = 0;

	struct mdss_data_type *mdata = mdss_mdp_get_mdata();
@@ -801,7 +801,7 @@ int mdss_mdp_irq_enable(u32 intr_type, u32 intf_num) 
	spin_lock_irqsave(&mdp_lock, irq_flags);

	if (mdata->mdp_irq_mask[irq.reg_idx] & irq.irq_mask) {

		pr_warn("MDSS MDP IRQ-0x%x is already set, mask=%x\n",

				irq.irq_mask, mdata->mdp_irq_mask[idx]);

				irq.irq_mask, mdata->mdp_irq_mask[irq.reg_idx]);

		ret = -EBUSY;

	} else {

		pr_debug("MDP IRQ mask old=%x new=%x\n",

drivers/video/msm/mdss/mdss_mdp_ctl.c

+1 −1
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ static u32 mdss_mdp_calc_prefill_line_time(struct mdss_mdp_ctl *ctl, 
{

	u32 prefill_us = 0;

	u32 prefill_amortized = 0;

	struct mdss_data_type *mdata;

	struct mdss_data_type *mdata = mdss_mdp_get_mdata();

	struct mdss_mdp_mixer *mixer;

	struct mdss_panel_info *pinfo;

	u32 fps, v_total;

drivers/video/msm/mdss/mdss_mdp_overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -1755,7 +1755,7 @@ end: 


int mdss_mode_switch(struct msm_fb_data_type *mfd, u32 mode)

{

	struct mdss_rect l_roi, r_roi;

	struct mdss_rect l_roi  = {0}, r_roi = {0};

	struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);

	struct mdss_overlay_private *mdp5_data = mfd_to_mdp5_data(mfd);

	struct mdss_mdp_ctl *sctl;