Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1485788

[PATCH 6/6] firmware-qemu_fw_cfg: Move a variable assignment in fw_cfg_sysfs_probe()

Path csiph.com!1.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!news.in-chemnitz.de!news2.arglkargh.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From SF Markus Elfring <elfring@users.sourceforge.net>
Newsgroups linux.kernel
Subject [PATCH 6/6] firmware-qemu_fw_cfg: Move a variable assignment in fw_cfg_sysfs_probe()
Date Sun, 18 Sep 2016 15:00:01 +0200
Message-ID <siJRn-8eJ-5@gated-at.bofh.it> (permalink)
References <qEuGl-43C-5@gated-at.bofh.it> <siJHH-8bB-9@gated-at.bofh.it>
User-Agent Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0
MIME-Version 1.0
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 robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 38
Organization linux.* mail to news gateway
X-Original-Cc LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org, Julia Lawall <julia.lawall@lip6.fr>
X-Original-Date Sun, 18 Sep 2016 14:58:14 +0200
X-Original-Message-ID <4546d20a-6e9c-5192-35c1-116bff2b3fc8@users.sourceforge.net>
X-Original-References <566ABCD9.1060404@users.sourceforge.net> <a736b350-a691-c73b-b8e9-67c0bffb716a@users.sourceforge.net>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1485788

Show key headers only | View raw


From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/6] firmware-qemu_fw_cfg: Fine-tuning for four function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 14:50 +0200
  [PATCH 3/6] firmware-qemu_fw_cfg: Rename jump labels in  fw_cfg_register_file() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200
  [PATCH 6/6] firmware-qemu_fw_cfg: Move a variable assignment in  fw_cfg_sysfs_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200
  [PATCH 1/6] firmware-qemu_fw_cfg: Use kmalloc_array() in  fw_cfg_register_dir_entries() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200
  [PATCH 2/6] firmware-qemu_fw_cfg: Improve a size determination in  fw_cfg_register_file() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200
  [PATCH 4/6] firmware-qemu_fw_cfg: Improve a size determination in  fw_cfg_build_symlink() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200
  [PATCH 5/6] firmware-qemu_fw_cfg: Rename jump labels in  fw_cfg_sysfs_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 15:00 +0200
  Re: [PATCH 0/6] firmware-qemu_fw_cfg: Fine-tuning for four function  implementations "Gabriel L. Somlo" <somlo@cmu.edu> - 2016-09-20 13:40 +0200

csiph-web