summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-10 02:20:42 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-10 02:20:42 -0700
commit0ca5c4d7030800f8fa565f4ed2046ce06ffdb050 (patch)
treeae85933bfd5b79b71b6e55492aa93f83a29ed10d
parent5564915b1f62f0c5bfa6387a66738ba1a10dc9cd (diff)
parent4c22995163a0a81c4dd674ebb9afc2dfa697bb7d (diff)
Merge "msm: mdss: Do not attempt to request TE irq again if already requested"
-rw-r--r--drivers/video/fbdev/msm/mdss_dsi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dsi.c b/drivers/video/fbdev/msm/mdss_dsi.c
index 4f1333426113..48b151b8080a 100644
--- a/drivers/video/fbdev/msm/mdss_dsi.c
+++ b/drivers/video/fbdev/msm/mdss_dsi.c
@@ -3429,9 +3429,10 @@ static int mdss_dsi_ctrl_probe(struct platform_device *pdev)
hw_vsync_handler, IRQF_TRIGGER_FALLING,
"VSYNC_GPIO", ctrl_pdata);
if (rc) {
- pr_err("TE request_irq failed.\n");
+ pr_err("%s: TE request_irq failed for ESD\n", __func__);
goto error_shadow_clk_deinit;
}
+ te_irq_registered = 1;
disable_irq(gpio_to_irq(ctrl_pdata->disp_te_gpio));
}