diff options
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c | 6 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_pp.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c b/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c index 9bebd72dce61..e1d2a947a77f 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c @@ -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 * 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); diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c index fed5c58e8b8a..d83bedacec28 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pp.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c @@ -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(); |