DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: wfd: Fix compilation error." into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2011-12-14 04:44:16 -08:00
committed by QuIC Gerrit Code Review
parent dc4d64e452 a35b234783
commit 10b7819385
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/msm/mdp4_overlay_writeback.c
View File

@@ -85,7 +85,7 @@ int mdp4_overlay_writeback_on(struct platform_device *pdev)
ptype = mdp4_overlay_format2type(format); ptype = mdp4_overlay_format2type(format);
if (ptype < 0) if (ptype < 0)
pr_err("%s: format2type failed\n", __func__); pr_err("%s: format2type failed\n", __func__);
pipe = mdp4_overlay_pipe_alloc(ptype, MDP4_MIXER1, 0); pipe = mdp4_overlay_pipe_alloc(ptype, MDP4_MIXER1);
if (pipe == NULL) if (pipe == NULL)
pr_info("%s: pipe_alloc failed\n", __func__); pr_info("%s: pipe_alloc failed\n", __func__);
pipe->pipe_used++; pipe->pipe_used++;
@@ -331,8 +331,6 @@ void mdp4_writeback_overlay(struct msm_fb_data_type *mfd)
(unsigned int)writeback_pipe->blt_addr); (unsigned int)writeback_pipe->blt_addr);
mdp4_writeback_kickoff_ui(mfd, writeback_pipe); mdp4_writeback_kickoff_ui(mfd, writeback_pipe);
mdp4_stat.kickoff_writeback++;
/* signal if pan function is waiting for the /* signal if pan function is waiting for the
* update completion */ * update completion */
if (mfd->pan_waiting) { if (mfd->pan_waiting) {