From: Markus Elfring Date: Tue, 6 Feb 2018 22:10:11 +0100 Subject: drm/tilcdc: panel: Use common error handling code in of_get_panel_info() Git-commit: b225e742542d944c883f578a5c0106157ff4fb7f Patch-mainline: v4.17-rc1 References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166 Add a jump target so that a bit of exception handling can be better reused at the end of this function. Signed-off-by: Markus Elfring Signed-off-by: Jyri Sarha Acked-by: Petr Tesarik --- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) --- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c @@ -289,10 +289,8 @@ static struct tilcdc_panel_info *of_get_ } info = kzalloc(sizeof(*info), GFP_KERNEL); - if (!info) { - of_node_put(info_np); - return NULL; - } + if (!info) + goto put_node; ret |= of_property_read_u32(info_np, "ac-bias", &info->ac_bias); ret |= of_property_read_u32(info_np, "ac-bias-intrpt", &info->ac_bias_intrpt); @@ -311,11 +309,11 @@ static struct tilcdc_panel_info *of_get_ if (ret) { pr_err("%s: error reading panel-info properties\n", __func__); kfree(info); - of_node_put(info_np); - return NULL; + info = NULL; } - of_node_put(info_np); +put_node: + of_node_put(info_np); return info; }