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

msm: mdss: unregister wled in case of probe failure

Browse source 
If the DSI probe fails and wled has been registered, then
when the next time probe comes there are failures seen.
Fix this by unregistering the wled in case of DSI probe
failures.

Conflicts:
	drivers/video/msm/mdss/mdss_dsi.h
	drivers/video/msm/mdss/mdss_dsi_panel.c

Change-Id: Ia3fd2fa2b5f5bd446c15bc4c28602846f8540a68
Signed-off-by: Vineet Bajaj <vbajaj@codeaurora.org>
This commit is contained in:
Vineet Bajaj 2015-05-27 19:26:53 +05:30 • committed by David Keitel
parent 26ef443158
commit d2736ae8fa
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/video/fbdev/msm/mdss_dsi.c
View file

@ -2585,6 +2585,7 @@ static int mdss_dsi_ctrl_probe(struct platform_device *pdev)
return 0;
error_pan_node:
mdss_dsi_unregister_bl_settings(ctrl_pdata);
of_node_put(dsi_pan_node);
return rc;
}

1
drivers/video/fbdev/msm/mdss_dsi.h
View file

@ -596,6 +596,7 @@ int mdss_panel_get_dst_fmt(u32 bpp, char mipi_mode, u32 pixel_packing,
int mdss_dsi_register_recovery_handler(struct mdss_dsi_ctrl_pdata *ctrl,
struct mdss_intf_recovery *recovery);
void mdss_dsi_panel_dsc_pps_send(struct mdss_dsi_ctrl_pdata *ctrl);
void mdss_dsi_unregister_bl_settings(struct mdss_dsi_ctrl_pdata *ctrl_pdata);
static inline const char *__mdss_dsi_pm_name(enum dsi_pm_type module)
{

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

@ -2102,6 +2102,12 @@ int mdss_dsi_panel_timing_switch(struct mdss_dsi_ctrl_pdata *ctrl,
return 0;
}
void mdss_dsi_unregister_bl_settings(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
{
if (ctrl_pdata->bklt_ctrl == BL_WLED)
led_trigger_unregister_simple(bl_led_trigger);
}
static int mdss_dsi_panel_timing_from_dt(struct device_node *np,
struct dsi_panel_timing *pt,
struct mdss_panel_data *panel_data)