summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@bootlin.com>2018-07-12 10:08:18 +0200
committerMaxime Ripard <maxime.ripard@bootlin.com>2018-07-12 18:48:54 +0200
commitb7178ffe7eb86fb9d428801509a5bd54d3ba94da (patch)
treecd7a7bddde069290dbb794dd8a60bd17f84458ad
parentf88c5ee77496886071e76b5b9fdfee7158f6d079 (diff)
downloadop-kernel-dev-b7178ffe7eb86fb9d428801509a5bd54d3ba94da.zip
op-kernel-dev-b7178ffe7eb86fb9d428801509a5bd54d3ba94da.tar.gz
drm/sun4i: tcon-top: Fix return type warning
When commit af11942ee44e ("drm/sun4i: tcon-top: Cleanup clock handling") was merged, the error handling path of the of_property_match_string was changed to take into account the fact that the returned value of that function wasn't an error pointer but an error code. Unfortunately, this introduced a warning since the now returned value is an integer, while the sun8i_tcon_top_register_gate function should return an error pointer. Fix that by calling ERR_PTR. Cc: Jernej Skrabec <jernej.skrabec@siol.net> Cc: Chen-Yu Tsai <wens@csie.org> Fixes: af11942ee44e ("drm/sun4i: tcon-top: Cleanup clock handling") Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reported-by: kbuild test robot <lkp@intel.com> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180712080818.3571-1-maxime.ripard@bootlin.com
-rw-r--r--drivers/gpu/drm/sun4i/sun8i_tcon_top.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c
index 046f8dd..55fe398 100644
--- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c
+++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c
@@ -99,7 +99,7 @@ static struct clk_hw *sun8i_tcon_top_register_gate(struct device *dev,
index = of_property_match_string(dev->of_node, "clock-names", parent);
if (index < 0)
- return index;
+ return ERR_PTR(index);
parent_name = of_clk_get_parent_name(dev->of_node, index);
OpenPOWER on IntegriCloud