From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757693AbcEEULo (ORCPT ); Thu, 5 May 2016 16:11:44 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:50983 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757575AbcEEULm (ORCPT ); Thu, 5 May 2016 16:11:42 -0400 From: Arnd Bergmann To: Maxime Ripard , David Airlie , Chen-Yu Tsai Cc: Arnd Bergmann , Boris Brezillon , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm: sun4i: fix probe error handling Date: Thu, 5 May 2016 22:10:52 +0200 Message-Id: <1462479061-893414-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:/aZtnwJW0bKQwx6/Ob37vkYXEyeKvug49U5aJ8xS3Myt94427Un adClPNVv5q3VkcBy29kx5/7RuqHfLLaNqpBBX0v3mD+2UKlID1jpoSVoVf8UlvaL4gdYljg ugkC6jKsCfPv6G+axb/nHQN6JEqJR0dSrI+t1wShmDpqoacqhxQveR2SrVLv4/CgOWc85VT n6H0s0k6eawlF3WL5n9wA== X-UI-Out-Filterresults: notjunk:1;V01:K0:KhgaPc48lEc=:9ZnNEoi/x3A27lISsk988i H0a1gvH6+dCTLB/kdr97qyih+iThwSPznjsEAOS+CK8V/af6OYv3/6xncbqrfpfG/2JhCZc6E z4scAStre0PLgLMmuZBNoHxFAWYxqKXKvPyvwogLiZ5iM7GxsijgUm0NkqaFN4DPne3GTwC9q VZXHupIoRxQHoPSHPDwl+R2NH3grk6YKTqrnaQUt5ahDbHLFwKRFDE92OzVZTizD0FWhQ7nb3 XTRoqmQVQ0v+l9dSYWEdPGF+MPDnRQcTE5Y9I1IK3/am0u7lMl1XAzIDrIzUQcw6rRAikFHHI /7cnPrwwGmunUOMmRoUv2AuMjH6i8zrhlsS7lZ7cP/aTAbvNgV4Ef6Hmk/us3/VUUvhQ6i8IG ijDtn+XTrmkjl3iv9le1RsJgAFszSuZnmAwAM5CsL8F+ZQMVevKJGf0oxi64JWuBCSJa9EXh1 RFpS/jdE252x9TQR4KX+vNCPRTRecA5aOBmzQDdx9aQN46peDeLQ3vxHt8RQoVtCzimDtRiPm 0QmLWtjU3u8+DQkuMCpuuIwoCvMsnM55dS1fp2nFjGfO7ugptUCbdXFKlJ8c5ydXzfKkj+RR/ 4lBwLzUI1Hfxj50PtFWSBYlXShlftC527o0Rg77h9hRB1lm3GnNl4EmlZadj4uz/X2FBUDk6K e0HywO69VWRmkipJiuU0PoDlY+5vWnfk1tU1b2hlLTxG4WcP3hxMRbkBvqjOGMZPhWwU= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc points out a possible uninitialized variable use in sun4i_dclk_create(): drivers/gpu/drm/sun4i/sun4i_dotclock.c: In function 'sun4i_dclk_create': drivers/gpu/drm/sun4i/sun4i_dotclock.c:139:12: error: 'clk_name' may be used uninitialized in this function [-Werror=maybe-uninitialized] init.name = clk_name; The warning only shows up when CONFIG_OF is disabled, and the property is never filled, but the same bug can show up even when CONFIG_OF is enabled but of_property_read_string_index returns another error. To fix it, this ensures that sun4i_dclk_create propagates any error from of_property_read_string_index. Signed-off-by: Arnd Bergmann Fixes: 9026e0d122ac ("drm: Add Allwinner A10 Display Engine support") --- drivers/gpu/drm/sun4i/sun4i_dotclock.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_dotclock.c b/drivers/gpu/drm/sun4i/sun4i_dotclock.c index 3ff668cb463c..6c9c090a8006 100644 --- a/drivers/gpu/drm/sun4i/sun4i_dotclock.c +++ b/drivers/gpu/drm/sun4i/sun4i_dotclock.c @@ -127,10 +127,14 @@ int sun4i_dclk_create(struct device *dev, struct sun4i_tcon *tcon) const char *clk_name, *parent_name; struct clk_init_data init; struct sun4i_dclk *dclk; + int ret; parent_name = __clk_get_name(tcon->sclk0); - of_property_read_string_index(dev->of_node, "clock-output-names", 0, - &clk_name); + ret = of_property_read_string_index(dev->of_node, + "clock-output-names", 0, + &clk_name); + if (ret) + return ret; dclk = devm_kzalloc(dev, sizeof(*dclk), GFP_KERNEL); if (!dclk) -- 2.7.0