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

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

Merge "msm: mdss: Fix potential NULL pointer dereferences"

parents fa97921d e5a8fc88

drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ init_lock_err: 


static int dsi_pll_enable(struct clk *c)

{

	int i, rc;

	int i, rc = 0;

	struct dsi_pll_vco_clk *vco = to_vco_clk(c);

	struct mdss_pll_resources *pll = vco->priv;

drivers/clk/msm/mdss/mdss-dsi-pll-8996.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static struct clk_lookup mdss_dsi_pllcc_8996_1[] = { 
int dsi_pll_clock_register_8996(struct platform_device *pdev,

				struct mdss_pll_resources *pll_res)

{

	int rc, ndx;

	int rc = 0, ndx;

	int const ssc_freq_default = 31500; /* default h/w recommended value */

	int const ssc_ppm_default = 5000; /* default h/w recommended value */

	struct dsi_pll_db *pdb;

drivers/video/msm/mdss/mdss_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ static ssize_t mdss_debug_perf_bw_limit_write(struct file *file, 
{

	struct mdss_data_type *mdata = file->private_data;

	char buf[32];

	u32 mode, val;

	u32 mode = 0, val = 0;

	u32 cnt;

	struct mdss_max_bw_settings *temp_settings;

drivers/video/msm/mdss/mdss_dsi.c

+3 −0
Original line number Diff line number Diff line
@@ -934,6 +934,9 @@ static int mdss_dsi_debugfs_init(struct mdss_dsi_ctrl_pdata *ctrl_pdata) 
	}



	pdata = &ctrl_pdata->panel_data;

	if (!pdata)

		return -EINVAL;



	panel_info = pdata->panel_info;

	rc = mdss_dsi_debugfs_setup(pdata, panel_info.debugfs_info->root);

	if (rc) {

drivers/video/msm/mdss/mdss_dsi_panel.c

+1 −1
Original line number Diff line number Diff line
@@ -1999,7 +1999,7 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np, 
	const char *data;

	struct mdss_dsi_ctrl_pdata *ctrl_pdata;

	struct mdss_panel_info *pinfo;

	bool phy_timings_present;

	bool phy_timings_present = false;



	pinfo = &panel_data->panel_info;