Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp352882ybg; Wed, 3 Jun 2020 02:29:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMuVoT4WKmOb2jcmDCSDNvqZ521/crExzYndIesE2oLrrMdFkddlNBtzIU0bwKbo4oCGIH X-Received: by 2002:a17:906:6094:: with SMTP id t20mr28759906ejj.359.1591176559051; Wed, 03 Jun 2020 02:29:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591176559; cv=none; d=google.com; s=arc-20160816; b=rBt7FzqnSxMNUcDTEqr1zHtvQDQlA2wcNo4Rggg80IcCsXseYqQTswyCwO7eUoVM/l 0/qyCL8UB1fkPmYEk/QbJv/ksp72pOtbPNShjqkMDsDRqUS8xQL05BcC2iG0H3KP2Eyv oGE0s5/yYPDjZgKgtFmI1tEEoBlSYXjB+0Khq9F9DH2QF2JOdA6TW5/X5nweb93uuKJ1 167p3N/4HA1lVOCL9qusL4AuBKpvvvLGSs2ysMCl9sz4nKVNUFm8wBkIYukAToTG2MvN Ilf5zH0gFBcS5esxoxxabOot6citkcAOWOQzgwhuUD3YtlvnflRBAWcfsAJ7oZ3NvzIf O5/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:content-transfer-encoding:mime-version :message-id:date:subject:cc:from:dkim-signature; bh=h9GWHN/DvK6JVin1rcNjThobH5dDbmXKSSUaeKlXzRE=; b=DTNXeVRC6a54g1NQDF+cD4ROyP+0jRLXhar7Utf5d9zo852+FAxBY39xDp7V0FGSBr 1Oa41bj8F5n5Ae7QYc2j+LH4D5NWNPmWMaOzEmzRIe+JXlnusgGIfHa//ibWbiEi7AEp f+DdETPkpJwXdQXp1NwxT618hozz5pB9YNC2lLqBxXMypMP/EF3fMe6IwD39dS8s8ZUR 8hf2rN2SpaEpw/pN0FZgkv4DuAbZKhTyksRMvQlxcCduM9H8bWF53PQdE8AJLwgHHjq3 kSpcG4KMVfbMRh1oS1WzQMvTobp00R10R6LuZLdg0QnUTht87zETVL+mQF6la57uQQt6 2dXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="vXGkfR/7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qq18si791090ejb.195.2020.06.03.02.28.56; Wed, 03 Jun 2020 02:29:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="vXGkfR/7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726402AbgFCJZK (ORCPT + 99 others); Wed, 3 Jun 2020 05:25:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725877AbgFCJZK (ORCPT ); Wed, 3 Jun 2020 05:25:10 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 636F6C05BD43 for ; Wed, 3 Jun 2020 02:25:10 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id n23so1331219pgb.12 for ; Wed, 03 Jun 2020 02:25:10 -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:mime-version :content-transfer-encoding; bh=h9GWHN/DvK6JVin1rcNjThobH5dDbmXKSSUaeKlXzRE=; b=vXGkfR/7XSismMTy2xpUY5NzSV5dRMg7Guk1ZLQycKkPBte420Yl461lMIv/rglXKh w4il0wt8H6u5mGEF8JOzcWDpDIQauqQBF5XK7V+X7Q8ijutPrNAxUElJTbjfstPLLq29 a8xzgCZGiK6K7QcxTlfOsI9ezP1PmXcn9ADWOaFeMXco2LIBgvGBEBZE3ZK782mUyJm1 U9pEifOCdt5b8+46i0+Rf4sSaMk8Pji9J/TlxZcafoR3Luj+ltt+lx13AwdwgmKeSgH/ O6janjDQ7zW+cPm3/nTTIDbDZk0xScqllUC+VgMJtvcQe68+ZxdKmltNxbU+VngFsjlK UTPg== 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:mime-version :content-transfer-encoding; bh=h9GWHN/DvK6JVin1rcNjThobH5dDbmXKSSUaeKlXzRE=; b=kpOJIQCGntmelDj7uzhHWGsWQCW4RQ7A4Rqh32rPMZlciH9TnPIgTjv2UkLNy/T7zZ Flp1Fx/bxxC/1dKvBG88SRptyl/2n6qW1jYqM48fWOp5yTSk3nGIWOsISDKyae9WDwMK Nu2pWLuJRu2VE+btHs7VZr0nIJ0sGK4cqcS3MQuzdTfxRVRboDtIcGIPMtKdIMwaLRn4 UySyoH6sR4DhDVJ80fMFPbAx+2bV69pr4JaYWzdQjg/vzBVui42K3BJ7clsZYvSwr/KB EKQb6sYleLwV6cqyDVNVGPsKDqG2v+PmgsTeiMQitDJkWqD6kUDoX0fDYJliEmN5EVTq y2Bg== X-Gm-Message-State: AOAM530+4ZnbBk1s1FOYKxmzINDYc9nig3vrkPv0nydKiKq0GPvjFZt1 R2KoNA7my7ysTIHvuEh/RHs= X-Received: by 2002:a63:4b55:: with SMTP id k21mr28425585pgl.46.1591176309952; Wed, 03 Jun 2020 02:25:09 -0700 (PDT) Received: from suzukaze.ipads-lab.se.sjtu.edu.cn ([202.120.40.82]) by smtp.gmail.com with ESMTPSA id h21sm1945710pjz.6.2020.06.03.02.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2020 02:25:09 -0700 (PDT) From: Chuhong Yuan Cc: Jaroslav Kysela , Takashi Iwai , Krzysztof Helt , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Chuhong Yuan Subject: [PATCH] ALSA: es1688: Add the missed snd_card_free() Date: Wed, 3 Jun 2020 17:24:59 +0800 Message-Id: <20200603092459.1424093-1-hslester96@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org snd_es968_pnp_detect() misses a snd_card_free() in a failed path. Add the missed function call to fix it. Fixes: a20971b201ac ("ALSA: Merge es1688 and es968 drivers") Signed-off-by: Chuhong Yuan --- sound/isa/es1688/es1688.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c index ff3a05ad99c0..64610571a5e1 100644 --- a/sound/isa/es1688/es1688.c +++ b/sound/isa/es1688/es1688.c @@ -267,8 +267,10 @@ static int snd_es968_pnp_detect(struct pnp_card_link *pcard, return error; } error = snd_es1688_probe(card, dev); - if (error < 0) + if (error < 0) { + snd_card_free(card); return error; + } pnp_set_card_drvdata(pcard, card); snd_es968_pnp_is_probed = 1; return 0; -- 2.26.2