Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89d3103b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: unregister wled in case of probe failure"

parents c72544e4 9ddd9cf2

drivers/video/msm/mdss/mdss_dsi.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

}

drivers/video/msm/mdss/mdss_dsi.h

+1 −0
Original line number Diff line number Diff line
@@ -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)

{

drivers/video/msm/mdss/mdss_dsi_panel.c

+6 −0
Original line number Diff line number Diff line
@@ -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)