From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751069AbdAXK1B (ORCPT ); Tue, 24 Jan 2017 05:27:01 -0500 Received: from mout.web.de ([212.227.17.12]:58979 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750785AbdAXK07 (ORCPT ); Tue, 24 Jan 2017 05:26:59 -0500 Subject: [PATCH 6/7] dmasound_core: Move two assignments for the variable "ret" in state_open() To: alsa-devel@alsa-project.org, Clemens Ladisch , Jaroslav Kysela , Martin Koegler , Takashi Iwai , Takashi Sakamoto References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: Date: Tue, 24 Jan 2017 11:26:15 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:6Fnk5Nq+OCM0TGzwBaOvDMGHiI6+tnIFwGUDEHf9TpJzUy4MAQr 9WpuoSiODB2B4W21QD9H7KDprM0+o1t7ibxww++ha1L1RJjWDfuuky9YJQ0Hdu1nPN/emro 87yKI/6OJkxZdBGL8unxnnHBvt4785o3YtdxvgyTtplDckYmoVsDkSadgGreaXYzNMF7a6W EPzHSJt85ojCokpEbVjxw== X-UI-Out-Filterresults: notjunk:1;V01:K0:FUGS+EYTG2I=:3Ok8oxT/D+c+JDRlIkZ5ua GEM08d4fdyLlkiHcyyXEHxqoDSgPMVU3oZsF58Qyqh5zCxkE0ZEy8jCgj4rv9Ik5UtydQ9SZ0 SfDUynYCWBJbnyc8hXjqGwkmPGfKEmtAy6UDxxGKLYD8EQCNLys/IM1c72fSQGicaS8+AJ3Dy DmImTNcNhEQ3Ch1oFuf62w5DYop9Sduqop//ffH/yisYT/wxwaTBbeI22G1kwT7FuEj/RGTAR khv9jpwfx8ciwsq+0uKnMlkOrNVp+nZfztwA41egzWfLPZN2EB60K5PpUxKHG/s43Y3mr7aRJ XfrSEaZopuGnx9B+HCN56fy6k56DayfzKK6QOFRjuNhTbbxFihna51IbMFr0lsiifN2H5YfAi 26Q5G3GXHKl5pizLWS+HB+DTH1YMLEHfVJgE6iGwenYo1HeDvUWIp2PO5yAH3W5FH/gIqk4fx rqaT8ZACXmcma5wUyEtcdZ2qv9NHIlVDLE86yWWWGy5FYCdsFAX8xNFkTrfv+VoSRF0Ysf6CD kS7kczABRYUbs+taehdy/vV/UAjnRk85zGjRr3d+UfJ9cPYwk8+fubALFkkWNFSp6uAoluO4S +Z9U7Mu08TVkaINYmd2f57vgyuzBbKAIE9LgnQs10EeugbKxLGdteubsGbzrZmunT0sb5UJLQ 49+qF6Q8hm3sHks1z3EI8QMCuWB0I4ew2ErmMBNBJ8d8mxZrrbyBUbgakvq07JfZVqX0XZa8Y DxezszktF8nMkg5W1/7wPzBHlNZLSeXsePVrNtF367i9ZX/A3U1Vfal7My1JzN3UjCmlPnXeF /ML+jpa Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 24 Jan 2017 10:05:29 +0100 A local variable was set to an error code in two cases before a concrete error situation was detected. Thus move the corresponding assignments into if branches to indicate a software failure there. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- sound/oss/dmasound/dmasound_core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c index f4ee85a4c42f..2bdd1d619a7f 100644 --- a/sound/oss/dmasound/dmasound_core.c +++ b/sound/oss/dmasound/dmasound_core.c @@ -1269,13 +1269,15 @@ static int state_open(struct inode *inode, struct file *file) int ret; mutex_lock(&dmasound_core_mutex); - ret = -EBUSY; - if (state.busy) + if (state.busy) { + ret = -EBUSY; goto out; + } - ret = -ENODEV; - if (!try_module_get(dmasound.mach.owner)) + if (!try_module_get(dmasound.mach.owner)) { + ret = -ENODEV; goto out; + } state.ptr = 0; state.busy = 1; -- 2.11.0