From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933825AbcIRM6d (ORCPT ); Sun, 18 Sep 2016 08:58:33 -0400 Received: from mout.web.de ([212.227.17.11]:49881 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756682AbcIRM6Y (ORCPT ); Sun, 18 Sep 2016 08:58:24 -0400 Subject: [PATCH 6/6] firmware-qemu_fw_cfg: Move a variable assignment in fw_cfg_sysfs_probe() To: qemu-devel@nongnu.org, Gabriel Somlo , "Michael S. Tsirkin" References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <4546d20a-6e9c-5192-35c1-116bff2b3fc8@users.sourceforge.net> Date: Sun, 18 Sep 2016 14:58:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:+/QpIg4uCEaI5CUGZN7dNZBClnzlXjkNFKcNQtnl4FSCZkPCKej NDupMDQzwOcH0kabRdXvPN5YxJgpEuXmJz9CJXROklncAhfp60gYir56Dn/taXftfQjMDR7 GzaMvmdMWP+nhq2mZLqI6/NnC7XGiH4tuFyZwvbq9EoEU4bYjEXxC1ZRgoKqgczhoCqGBR7 WRy3XuE89OVP/ypQVJx/Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:BDQvazkmvJM=:/H/R5S0lE06gHrBEEetoAK hmPxnNex9Qs6L9yw7AH+S6fLzKs4v4U2+7sDduZkOhSA+44x6CvUC4R7uH5acfK1jBjRAqj4+ jMRiMQIAIKGlw/SNMBgUSs/lBnuQz9M1d5FpKn9+HxTYxjf1pxlDDCaG+/KmNhVAEkxDXMB6Q t1Kw1Bx3yqZWVkoyxcWOpx7KJObjWisjeKOLWcYA7GkfByNpoB37r/mvsDnhwrtPWziPWU7P0 UcDCrxXCOOAtZYSOd8bz2aI8Ce1Y7uzFswHLuZswhaofQ8J2Zm90RN3vGVxERs9XzBxnSwdY8 f8r9228qboKi+VBzpw0rLjglxFxuP3AjzqKDb/mYuqiPyuPIo81zj3XRTvqmDac47wrQFn5DW Tw0PjXbS1dSlUdEck+WKzKjAIqrdk9v9bMXSjdqlqXSQN0FeINcj3CzEYdZJ6+XZAaRFgbdWL RMloaOUIQ2LQCBnaoYMiP/dloy3ksMf4LoO8t9heN2FJPO25ccg0MN/qFWycw/DjRmJRNZZpg EhtNWJlOdy0bD7piAd2ZdJGLRoXEus53VgePkqy38F8mJo199q1sDg3c9xK/91XYQJR47YdvM ttyRFMQi8OknCHEemLocdQnTmORG2DhjFppMd7yo1oNpniUxSa2TrpMu/MF4/3UjSZodyrGHQ 02YKSrZOf3tU62n6m6swde2KM4UOPqkW3XYdhcz7Jo0W/rNUFy1R6SonggDf3rgNS3vnTcJy5 SI+T0cn9DG4t4O6KfPrK+TWnC++Uys3T8t0ODOMTcqUAZ60HfA4bYc65alhmxMcUFEOJFJ17d 38HBJLE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 18 Sep 2016 14:25:55 +0200 One local variable was set to an error code before a concrete error situation was detected. Thus move the corresponding assignment into two if branches to indicate a software failure there. Signed-off-by: Markus Elfring --- drivers/firmware/qemu_fw_cfg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index a09e59c..23293a1 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c @@ -535,13 +535,16 @@ static int fw_cfg_sysfs_probe(struct platform_device *pdev) return -EBUSY; /* create by_key and by_name subdirs of /sys/firmware/qemu_fw_cfg/ */ - err = -ENOMEM; fw_cfg_sel_ko = kobject_create_and_add("by_key", fw_cfg_top_ko); - if (!fw_cfg_sel_ko) + if (!fw_cfg_sel_ko) { + err = -ENOMEM; goto exit; + } fw_cfg_fname_kset = kset_create_and_add("by_name", NULL, fw_cfg_top_ko); - if (!fw_cfg_fname_kset) + if (!fw_cfg_fname_kset) { + err = -ENOMEM; goto cleanup_object; + } /* initialize fw_cfg device i/o from platform data */ err = fw_cfg_do_platform_probe(pdev); -- 2.10.0