From 925b38361852ef314e9ecc649e830ad5319e3a65 Mon Sep 17 00:00:00 2001 From: Anson Huang Date: Wed, 21 Nov 2018 05:49:40 +0000 Subject: thermal: imx: save one condition block for normal case of nvmem initialization Put return value checks of calling imx_init_from_nvmem_cells() into one block to save one condition block for normal case. Signed-off-by: Anson Huang Acked-by: Viresh Kumar Reviewed-by: Daniel Lezcano Signed-off-by: Eduardo Valentin --- drivers/thermal/imx_thermal.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/thermal/imx_thermal.c') diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index c924396685a0..bb6754a5342c 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -742,9 +742,10 @@ static int imx_thermal_probe(struct platform_device *pdev) if (of_find_property(pdev->dev.of_node, "nvmem-cells", NULL)) { ret = imx_init_from_nvmem_cells(pdev); - if (ret == -EPROBE_DEFER) - return ret; if (ret) { + if (ret == -EPROBE_DEFER) + return ret; + dev_err(&pdev->dev, "failed to init from nvmem: %d\n", ret); return ret; -- cgit v1.2.3