From patchwork Mon Jun 11 07:41:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhouyang Jia X-Patchwork-Id: 10457331 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 97D7660467 for ; Mon, 11 Jun 2018 07:46:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D41227FAE for ; Mon, 11 Jun 2018 07:46:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F7CF27FB1; Mon, 11 Jun 2018 07:46:04 +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=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4408927FAE for ; Mon, 11 Jun 2018 07:46:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932250AbeFKHpw (ORCPT ); Mon, 11 Jun 2018 03:45:52 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35814 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754105AbeFKHpu (ORCPT ); Mon, 11 Jun 2018 03:45:50 -0400 Received: by mail-pg0-f67.google.com with SMTP id 15-v6so9341201pge.2; Mon, 11 Jun 2018 00:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Pxo8K9YKGGcGEXwNw0iA013qkB/ESS9u++hAkgBSw1w=; b=g9oeeHIl5ITQyk33nU3nWaZmC1fYoaeqy/anDSsK4IH9RSHgvaH3tVDJzRDNtZUNHx cIpHkFQO9J9UEXJHEMuzD4MFWxfrpuyfPZAX4ti/muRjaRogrOHWd8VDz4BA0B+6QRqG ysEKCUGVuDix98oFfacrhVVskUc2sddvAqwZHWRVP/PMRkILqjv2wAy5POhmYg7cHEkK /oT8WXpizlSK2UI4FJVwU71VdDUe1TAHGXc4IqtBRzw237xf+Nta76YDHyOeVKYQBWzq zocrjr1XOLJn6T+kUjTdeG1iYC1Y7KmcCa02+5IRPOIPvuJ5cdYHB4Febc5uMDKqzcO6 AbcA== 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=Pxo8K9YKGGcGEXwNw0iA013qkB/ESS9u++hAkgBSw1w=; b=fT7giCQfUBW/7GRCUehp6kHLgmZIEJV9+jwNlwwGWUs1KzKtz7VSWduZp6oCV2aIKr ZULXOxK/A1x49aR7MOvjnUcHIBSPvB38MPoyhsuZQsBL9Jnlb+RuU+YlqmcearTtElVw GbVoQRhG+y3HbD2rTR935k1fjK+oRIKcGjENuCjLfp4w6dZJ6iqXIOTTjQVY2juPDYHq mtMp+BvbA2MKl/eKyzQu2Pv6jz8Mt4jsvOiq1dqNZAijpVNcMfGUWcuhL01LpV4MXf1l KCjuHSot7g1tJlC7NxDHpteahJ0yMWKBZ8su2V0hTLh32FUzLyyR/9TKbjmc3c/JQp9r TiHw== X-Gm-Message-State: APt69E33dwaV5gBQ44xKbyKqyJYf0o8VrwOlhSAnIOzRUHXXcVCqDkGq MBniJM41bkSCJkGBXI9qeF8= X-Google-Smtp-Source: ADUXVKKrtwSlJjLafPZ8TTSAEMI3GvG4juErDFesonclQqFEGmluHCGj3THhzbLvKAHTiNY3Fd94sQ== X-Received: by 2002:a63:a702:: with SMTP id d2-v6mr14153888pgf.246.1528703150256; Mon, 11 Jun 2018 00:45:50 -0700 (PDT) Received: from localhost ([103.88.46.82]) by smtp.gmail.com with ESMTPSA id v85-v6sm34835711pgb.50.2018.06.11.00.45.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Jun 2018 00:45:49 -0700 (PDT) From: Zhouyang Jia Cc: Zhouyang Jia , Mauro Carvalho Chehab , Brian Warner , Hans Verkuil , Bhumika Goyal , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: cx88: add error handling for snd_ctl_add Date: Mon, 11 Jun 2018 15:41:58 +0800 Message-Id: <1528702920-33410-1-git-send-email-jiazhouyang09@gmail.com> X-Mailer: git-send-email 2.7.4 To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When snd_ctl_add fails, the lack of error-handling code may cause unexpected results. This patch adds error-handling code after calling snd_ctl_add. Signed-off-by: Zhouyang Jia --- drivers/media/pci/cx88/cx88-alsa.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c index 8a28fda..d366793 100644 --- a/drivers/media/pci/cx88/cx88-alsa.c +++ b/drivers/media/pci/cx88/cx88-alsa.c @@ -962,8 +962,11 @@ static int cx88_audio_initdev(struct pci_dev *pci, goto error; /* If there's a wm8775 then add a Line-In ALC switch */ - if (core->sd_wm8775) - snd_ctl_add(card, snd_ctl_new1(&snd_cx88_alc_switch, chip)); + if (core->sd_wm8775) { + err = snd_ctl_add(card, snd_ctl_new1(&snd_cx88_alc_switch, chip)); + if (err < 0) + goto error; + } strcpy(card->driver, "CX88x"); sprintf(card->shortname, "Conexant CX%x", pci->device);