Message ID | 20230807090045.198993-2-maarten.lankhorst@linux.intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1318880vqr; Mon, 7 Aug 2023 02:09:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFurwyVnBgd0YquYc6SwlM0CzZJBFRP3LsABEYbwYe2TVGM9rfwt1sG8EwdKWgmERGqIdX X-Received: by 2002:a17:90a:4966:b0:263:68b0:8ca5 with SMTP id c93-20020a17090a496600b0026368b08ca5mr6761901pjh.43.1691399378281; Mon, 07 Aug 2023 02:09:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691399378; cv=none; d=google.com; s=arc-20160816; b=gwd2u+SUiRedFzZMHCDxtry8ubJ+SO6nYddO8Bv2K9KbdfFJKd3y6zmhJknHgxfeMt W8zdJr7b9PYy2OHE31hM6XAAXtFTc9YLTwT1X1IYoRZVZ6dzFuqDWooX6FourhTqKeQZ zFsnaitz2MtPKKPJZuwrziRhFDqZlkjGQCiR2WUUagqJ1AEe4+OIkEJhHqcUerEg23sk OHoMx3CJPFQDUCMi1Q14iBO6F6qU/V5GbqL8fdI0YGhnsLCaBdv/TPho6gB4dj+WWhUo RUeWfEmgnRllSJVG9FYe3PZdDS1SV6piJxxrHWKfEDA7npl3HEvQWIKAf5r7ZVGXlcWA uhJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2thxQ7UeFT8+iZe6411yYf4VOXCI/lAAZdlHdtPm240=; fh=BXAiiC6ODviiKux+ApVm3yEF4jvtq/D5DoYh0OgxZlk=; b=rS7fBXfrZOnZ3AOb8P27OC9BwdKKT8a69xRt2ol4IHg5D26//40ZLnyIHFmJlFX3EL aV3/oluTyqbtZ+Qm+6L+T+0eJDxlN/+6Uaz8L6quJuVgnOc8dLjkGhHID3HfjtrWFeZg G6QjOS9S1QgbTUZECw+Rv68LC0C6WlUs5Yc2YTc4jSp72ZttLuNRgsXBe/KjzwXKBSdT VyT6nlmyvi6PUrILHwU++IT8t9PJSFzFX4O0Bhb9TkuK2W/HWC011CfmA+bVHTa95wLr Tf08YAjQbYtVLsU/bVy8IX9Uf+3HYeuCz8UHMS3D8rLP8lbYfheXRC1dlRVYkkiF+w5H OQ5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k8-20020a17090a514800b00263355e8183si5578394pjm.114.2023.08.07.02.09.25; Mon, 07 Aug 2023 02:09:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230369AbjHGJBZ (ORCPT <rfc822;aaronkmseo@gmail.com> + 99 others); Mon, 7 Aug 2023 05:01:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231277AbjHGJBU (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 7 Aug 2023 05:01:20 -0400 Received: from mblankhorst.nl (lankhorst.se [IPv6:2a02:2308:0:7ec:e79c:4e97:b6c4:f0ae]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C039E74 for <linux-kernel@vger.kernel.org>; Mon, 7 Aug 2023 02:01:17 -0700 (PDT) From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> To: alsa-devel@alsa-project.org Cc: Maarten Lankhorst <dev@lankhorst.se>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Cezary Rojewski <cezary.rojewski@intel.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Liam Girdwood <liam.r.girdwood@linux.intel.com>, Peter Ujfalusi <peter.ujfalusi@linux.intel.com>, Bard Liao <yung-chuan.liao@linux.intel.com>, Ranjani Sridharan <ranjani.sridharan@linux.intel.com>, Kai Vehmanen <kai.vehmanen@linux.intel.com>, Mark Brown <broonie@kernel.org>, Daniel Baluta <daniel.baluta@nxp.com>, linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Subject: [PATCH v3 1/9] ALSA: hda/intel: Fix error handling in azx_probe() Date: Mon, 7 Aug 2023 11:00:37 +0200 Message-Id: <20230807090045.198993-2-maarten.lankhorst@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230807090045.198993-1-maarten.lankhorst@linux.intel.com> References: <20230807090045.198993-1-maarten.lankhorst@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,SPF_HELO_NONE,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773560794632199952 X-GMAIL-MSGID: 1773560794632199952 |
Series |
sound: Use -EPROBE_DEFER instead of i915 module loading.
|
|
Commit Message
Maarten Lankhorst
Aug. 7, 2023, 9 a.m. UTC
Add missing pci_set_drv to NULL call on error. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> --- sound/pci/hda/hda_intel.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ef831770ca7d..0d2d6bc6c75e 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2188,6 +2188,7 @@ static int azx_probe(struct pci_dev *pci, return 0; out_free: + pci_set_drvdata(pci, NULL); snd_card_free(card); return err; }