evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: fix use of uninitialized local variable"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-28 08:41:56 -08:00 • committed by Gerrit - the friendly Code Review server
commit d7b12827ab
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c
View file

@ -1,4 +1,4 @@
/* 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 * 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 * 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 * updating img_width with buffer->planes[0].stride
*/ */
fmt = mdss_mdp_get_format_params(buffer->format); 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, mdss_mdp_get_plane_sizes(fmt, ctx->img_width,
buffer->height, &ps, 0, 0); buffer->height, &ps, 0, 0);

2
drivers/video/fbdev/msm/mdss_mdp_pp.c
View file

@ -5283,7 +5283,7 @@ static int pp_hist_collect(struct mdp_histogram_data *hist,
u32 block) u32 block)
{ {
int ret = 0; int ret = 0;
u32 sum; int sum = 0;
char __iomem *v_base = NULL; char __iomem *v_base = NULL;
unsigned long flag; unsigned long flag;
struct mdss_data_type *mdata = mdss_mdp_get_mdata(); struct mdss_data_type *mdata = mdss_mdp_get_mdata();