From patchwork Sun Jan 6 17:16:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Pakki X-Patchwork-Id: 10750061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4454D6C5 for ; Mon, 7 Jan 2019 07:08:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 305C7285A0 for ; Mon, 7 Jan 2019 07:08:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20E18285A6; Mon, 7 Jan 2019 07:08:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 786E7285A0 for ; Mon, 7 Jan 2019 07:08:52 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id C6697267B84; Mon, 7 Jan 2019 08:07:22 +0100 (CET) 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 687CD267A86; Sun, 6 Jan 2019 18:16:13 +0100 (CET) Received: from mta-p8.oit.umn.edu (mta-p8.oit.umn.edu [134.84.196.208]) by alsa0.perex.cz (Postfix) with ESMTP id CCCD6267A69 for ; Sun, 6 Jan 2019 18:16:10 +0100 (CET) Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id E832DC12 for ; Sun, 6 Jan 2019 17:16:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1EyxBWYbuaic for ; Sun, 6 Jan 2019 11:16:09 -0600 (CST) Received: from mail-it1-f197.google.com (mail-it1-f197.google.com [209.85.166.197]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p8.oit.umn.edu (Postfix) with ESMTPS id BB375A92 for ; Sun, 6 Jan 2019 11:16:09 -0600 (CST) Received: by mail-it1-f197.google.com with SMTP id 128so6328418itw.8 for ; Sun, 06 Jan 2019 09:16:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=G831cuWKGqn39aVq/djZERsMInuvXiNimpsVKbJIPFE=; b=dLqb8SqT7k11RgmK/hlemMDSIghyTMCW1+boVQ3g5a5X4g47HgyNFaMdX6TRTmhoFN grC9dyPdY4zcNX+h850Qi8j9XMWa1/WQizNYKt20Pf0MyL7W7FiFHORn5fbwoc3u7Jfr evSWxS3KC40AFAB6XooDWONckaVO3bEmm4/5j2ihRWPDCoECq/Nd/Ndz6N251koWAgQz IyKAEkN/tlOLCK9inyN5zHcBvXKkUnPhcJ/W+P57cmQTCBQ5RkXPZICcK7l785ZcZADo hed8VRkYAnq431zXF4joqv8GgW8O1Zrp3EJ+Yf0hQ49qHfR5qBaSZd5XKTO1ac1K5Zr3 96Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=G831cuWKGqn39aVq/djZERsMInuvXiNimpsVKbJIPFE=; b=URCsiSFQt6oQdtZFMTZzPUnh/wFEvu1RuD2DPti+zVRrZHSfq7Ve2TwLsJI6FjEMlD rT0ITfIG5V8ZCTySXYyWPZ+VeJiRM4u62MocTHVzd/X0ifdGK+2RGAZjyk0QGKX43olS Vc+EMrCKLVD3icYRJhxr0CjUjsSizEHF3W57xtL0HyMqdDfq53JnRVcaButIMItKsmut y2WelhHKr84ekeeumhmn1bHk54S+QXfkrFpmYuZj+VVDPKCHwYjysBzHmy6M7ZMX/jor iapvNCjJJF5Cu4TSpi1JiPA0y0d6UJ37h4JfbjJjk98u0cXXlLKa/zamD0KTfeYMFcf/ kvjA== X-Gm-Message-State: AJcUukflgzFjZ+kLOCphgZQoWoVWXE3qS2+wUi8rKBOIBGjEp7WAPE7V WlBW1DewGuV9x3CYuYqLKy3egej8QZZmnxdDRWTXET8Q7Pz8/7wiBl+HgqtLYs2scnEbGorZgO7 opBXIUyfqRbbCqgW1cS28/qytXYM= X-Received: by 2002:a6b:2c92:: with SMTP id s140mr40142968ios.218.1546794969397; Sun, 06 Jan 2019 09:16:09 -0800 (PST) X-Google-Smtp-Source: ALg8bN7Afwi/zSJz8HRuW8FVqwhutCFbkXPPIMobyniJay9mGWlt3CD6nVGhS+stEzoisJNpEoXd/w== X-Received: by 2002:a6b:2c92:: with SMTP id s140mr40142959ios.218.1546794969179; Sun, 06 Jan 2019 09:16:09 -0800 (PST) Received: from cs-u-syssec1.cs.umn.edu (cs-u-syssec1.cs.umn.edu. [134.84.121.78]) by smtp.gmail.com with ESMTPSA id b140sm3251551itc.4.2019.01.06.09.16.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Jan 2019 09:16:08 -0800 (PST) From: Aditya Pakki To: pakki001@umn.edu Date: Sun, 6 Jan 2019 11:16:00 -0600 Message-Id: <20190106171601.10506-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 X-Mailman-Approved-At: Mon, 07 Jan 2019 08:06:57 +0100 Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, kjlu@umn.edu, Takashi Iwai Subject: [alsa-devel] [PATCH] [v2] ALSA: isa: fix a missing check of snd_ctl_add 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP snd_ctl_add() could fail, so let's check its return value and return its error code upstream upon failure. Signed-off-by: Aditya Pakki --- sound/isa/sb/sb16_main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c index 37e6ce7b0b13..981d65d122b6 100644 --- a/sound/isa/sb/sb16_main.c +++ b/sound/isa/sb/sb16_main.c @@ -879,10 +879,14 @@ int snd_sb16dsp_pcm(struct snd_sb *chip, int device) snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb16_playback_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops); - if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) - snd_ctl_add(card, snd_ctl_new1(&snd_sb16_dma_control, chip)); - else + if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) { + err = snd_ctl_add(card, snd_ctl_new1( + &snd_sb16_dma_control, chip)); + if (err) + return err; + } else { pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX; + } snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_isa_data(),