From: Rajan Vaja <rajan.vaja@xilinx.com>
Date: Wed, 14 Nov 2018 07:46:49 +0000 (-0800)
Subject: clk: zynqmp: handle fixed factor param query error
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=27c0f2b0197070c8e94bdf28686d4c63b959dea8;p=openwrt%2Fstaging%2Fblogic.git

clk: zynqmp: handle fixed factor param query error

Return proper error code in case query for fixed factor
parameter fails. This also fixes build warning for set
but not used variable 'ret'.

Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
Fixes: 3fde0e16d016 ("drivers: clk: Add ZynqMP clock driver")
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
---

diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c
index 9d7d297f0ea8..297f16a20bfc 100644
--- a/drivers/clk/zynqmp/clkc.c
+++ b/drivers/clk/zynqmp/clkc.c
@@ -279,6 +279,9 @@ struct clk_hw *zynqmp_clk_register_fixed_factor(const char *name, u32 clk_id,
 	qdata.arg1 = clk_id;
 
 	ret = eemi_ops->query_data(qdata, ret_payload);
+	if (ret)
+		return ERR_PTR(ret);
+
 	mult = ret_payload[1];
 	div = ret_payload[2];