From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754000AbdHWMz0 (ORCPT ); Wed, 23 Aug 2017 08:55:26 -0400 Received: from mout.web.de ([212.227.15.4]:55989 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753921AbdHWMzY (ORCPT ); Wed, 23 Aug 2017 08:55:24 -0400 Subject: [PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open() To: alsa-devel@alsa-project.org, Clemens Ladisch , Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto Cc: LKML , kernel-janitors@vger.kernel.org References: <05f76303-7370-ea37-20c2-116c04b850db@users.sourceforge.net> From: SF Markus Elfring Message-ID: <05c137e8-e417-162b-c588-f5fc22be5ed6@users.sourceforge.net> Date: Wed, 23 Aug 2017 14:54:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:bY4so/ZO6yZ+u9x17eoclqfXdFDetuwQiMpvzR8aJYxJx0fK9C5 2QD4pfyPvEEc1pTy6MUKdyBZvnX0U9puByaGf6FEBA91QaeL1AGKFWNkSatYdByZKu16zri Qk8lTueFQbC3jghDKajWnw5m0w0tHDyKsmhcua00TAfF9z1d8/1Z5WJKz8z0bQhiy7X0xtj M74z5K4rp9R/zYsWOurJw== X-UI-Out-Filterresults: notjunk:1;V01:K0:r2q/zlw55eI=:yXuXJ9mig5rqzB6VfhZLU/ tE7mFo9IvzDu8yrM4cfCdNztkJlx8lGjy6Ih4r+wBO3SyCT39NEVilxH38WbgHhGSfEM5CwVt yCXYf9y81ZE2RWGZXbRuRq6RaRElw5aVuHaRMEzLnSEGQ2nVf2ZOcLfMTx65GCfCTXQGxq/mO oo308t6ZPtrHqznFForH02zTEmn6Vx9uiyweKuaMz4U1eu3S4DuVeQOBaxDNhN6vXI4JkTDaz mnyXDhBAmgRSUfoG+561w/sWcOqGsnbhJRbirUjQnduLlldba/7MW1TUCL1WhACWSkiB7a1Uf rKMx9rZ1V0YK4I38m5oFH4bDcg5XhV6+WFCETAJKiYhANV1TaDoC902liLuNDGLiwkOHPVBe6 1I7hgRo8OQc8+NxiIfXr15eFxSMx33ciOKhU/wF6O6aKn4zktnluS0oWXSvsXGj7XuOY25JjM yky2FnLPflEqp5+gV5bdbqiEtXXgKOXlU5dRzI0zI84vhshHO4yT+aew3zZRImkDdSSZaeWOE lpZTG9pEtKwlFg32CZxvfhwex3bujihiuHF9V6XGbQ0H02WNLr0b+fYfwNxO4D+Rz5kdHf0/8 HH+2FIndAYgxGqoGIWe0al5i6AV2ohBDhUPaEtMndEBi/lRn9ZG2/l1y+Y18g0AADuFa8t8Tr dbBReSFvilFdS+h/mr/qz9O8Ew+hD1GRzt3Gjmwh95SEEFpaIw6oW+bOzqWdEmsp6PUukQIk8 K5AzmOUATAbTCL7VTc/3Of9wygjvhx6wBPVtVZL0LU2XZwg6Yrii62AuzugtvhYJ3DCn1/tBn FUj/RydCEFtXTOi0VssYX2rbpgW2Uj9oIjVtZbvCdjMHdFRCis= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 23 Aug 2017 14:45:20 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- v2: It seems that a source code adjustment was requested by Takashi Sakamoto for another if branch. sound/firewire/fireface/ff-pcm.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/firewire/fireface/ff-pcm.c b/sound/firewire/fireface/ff-pcm.c index d12a0e3a4219..e3c16308363d 100644 --- a/sound/firewire/fireface/ff-pcm.c +++ b/sound/firewire/fireface/ff-pcm.c @@ -138,16 +138,12 @@ static int pcm_open(struct snd_pcm_substream *substream) return err; err = pcm_init_hw_params(ff, substream); - if (err < 0) { - snd_ff_stream_lock_release(ff); - return err; - } + if (err < 0) + goto release_lock; err = ff->spec->protocol->get_clock(ff, &rate, &src); - if (err < 0) { - snd_ff_stream_lock_release(ff); - return err; - } + if (err < 0) + goto release_lock; if (src != SND_FF_CLOCK_SRC_INTERNAL) { for (i = 0; i < CIP_SFC_COUNT; ++i) { @@ -159,8 +155,8 @@ static int pcm_open(struct snd_pcm_substream *substream) * streaming engine can't support. */ if (i >= CIP_SFC_COUNT) { - snd_ff_stream_lock_release(ff); - return -EIO; + err = -EIO; + goto release_lock; } substream->runtime->hw.rate_min = rate; @@ -177,6 +173,10 @@ static int pcm_open(struct snd_pcm_substream *substream) snd_pcm_set_sync(substream); return 0; + +release_lock: + snd_ff_stream_lock_release(ff); + return err; } static int pcm_close(struct snd_pcm_substream *substream) -- 2.14.0