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

Commit d7b12827 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 use of uninitialized local variable"

parents fff2481f aaac2913

drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c

+5 −1
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
@@ -521,6 +521,10 @@ int mdss_mdp_writeback_prepare_cwb(struct mdss_mdp_ctl *ctl, 
	 * updating img_width with buffer->planes[0].stride

	 */

	fmt = mdss_mdp_get_format_params(buffer->format);

	if (!fmt) {

		pr_err("invalid format for cwb\n");

		return -EINVAL;

	}

	mdss_mdp_get_plane_sizes(fmt, ctx->img_width,

			buffer->height, &ps, 0, 0);

drivers/video/fbdev/msm/mdss_mdp_pp.c

+1 −1
Original line number Diff line number Diff line
@@ -5283,7 +5283,7 @@ static int pp_hist_collect(struct mdp_histogram_data *hist, 
				u32 block)

{

	int ret = 0;

	u32 sum;

	int sum = 0;

	char __iomem *v_base = NULL;

	unsigned long flag;

	struct mdss_data_type *mdata = mdss_mdp_get_mdata();