From patchwork Wed May 28 16:42:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 4256441 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 442289F336 for ; Wed, 28 May 2014 16:42:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B4292027D for ; Wed, 28 May 2014 16:42:57 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 629F42026C for ; Wed, 28 May 2014 16:42:56 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3956B26528B; Wed, 28 May 2014 18:42:50 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 39B1D26519F; Wed, 28 May 2014 18:42:41 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6205F2651DC; Wed, 28 May 2014 18:42:38 +0200 (CEST) Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by alsa0.perex.cz (Postfix) with ESMTP id 3076226513D for ; Wed, 28 May 2014 18:42:29 +0200 (CEST) Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s4SGgQLX002780 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 28 May 2014 16:42:26 GMT Received: from userz7022.oracle.com (userz7022.oracle.com [156.151.31.86]) by ucsinet22.oracle.com (8.14.5+Sun/8.14.5) with ESMTP id s4SGgJOp006378 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 28 May 2014 16:42:20 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userz7022.oracle.com (8.14.5+Sun/8.14.4) with ESMTP id s4SGgI8L006313; Wed, 28 May 2014 16:42:18 GMT Received: from mwanda (/41.202.240.7) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 28 May 2014 09:42:16 -0700 Date: Wed, 28 May 2014 19:42:02 +0300 From: Dan Carpenter To: Clemens Ladisch Message-ID: <20140528164202.GB1824@mwanda> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Takashi Iwai , alsa-devel@alsa-project.org, Takashi Sakamoto , kernel-janitors@vger.kernel.org Subject: [alsa-devel] [patch 1/2] ALSA: fireworks: remove some stray checks X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP We checked "err" earlier. These things seem to be left over code. Signed-off-by: Dan Carpenter Tested-by: Takashi Sakamoto diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c index a354d26..8e856cc 100644 --- a/sound/firewire/fireworks/fireworks.c +++ b/sound/firewire/fireworks/fireworks.c @@ -89,8 +89,6 @@ get_hardware_info(struct snd_efw *efw) snprintf(version, sizeof(version), "%u.%u", (hwinfo->arm_version >> 24) & 0xff, (hwinfo->arm_version >> 16) & 0xff); - if (err < 0) - goto end; efw->firmware_version = hwinfo->arm_version; strcpy(efw->card->driver, "Fireworks"); @@ -101,8 +99,6 @@ get_hardware_info(struct snd_efw *efw) hwinfo->vendor_name, hwinfo->model_name, version, hwinfo->guid_hi, hwinfo->guid_lo, dev_name(&efw->unit->device), 100 << fw_dev->max_speed); - if (err < 0) - goto end; if (hwinfo->flags & BIT(FLAG_RESP_ADDR_CHANGABLE)) efw->resp_addr_changable = true;