From patchwork Thu Jan 12 11:28:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 42389 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3833055wrt; Thu, 12 Jan 2023 03:43:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXuKa7s+kDRzq7YpZ8lZtOX7Unonpl/VWTCnmmYG52cRgeDrAUMBSsBM+xHnO4yMGvGR/Aaf X-Received: by 2002:a17:907:d093:b0:7c0:cd95:bbb7 with SMTP id vc19-20020a170907d09300b007c0cd95bbb7mr61138754ejc.77.1673523793019; Thu, 12 Jan 2023 03:43:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673523793; cv=none; d=google.com; s=arc-20160816; b=HF0CeFkOBqpMBRLPZgvjDsLxL5Ch9nYMlX3dn2qsopJCQm902IcVBPyEL9SIQol4G1 jeMsL8ZRadBpB5ZH+yPeiUB9qhiINZkJ/6tAz8REW1hLwORrV6KPRlDIhP2sNhKicy1Y NfOYg4Mte4Ezt2um4WLxECBeHtwuUwYHXfW0+IyUltyjB4/mo8T3jNQvkEqXwjd14Nv1 9vQOomKPLWW7vhxpPrPmwa5W9i8gySXv+/9sU7xKxvs6NMyTq6xs66D1C2Bd1oWfRcIL BcxZn/UGglD0Sz5XUVmg+ICH8tCINYyWaD/fLkJ7sx43AbhJTBbp1KF4qXVQJFWb0F29 7oYg== 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 :dkim-signature; bh=0QdAwA4JdsWpztWRMdMYQsdIgLaCMlT/XkfVF2eYZzw=; b=jnt1XKsyPzsnsBUabuT6gV1Lum7FpD+j7furseeze3xwNenFEkCGjWb+u87fdsIG7X 4ZvOkpZ6UlREXBvM/ACw5pxvOCaSFhWrHPqLbMRK5Yx+6Dg2r1ZYP1VesDFmiRVQVEDx HqoTMEFdn0pPya22h5Duwza9S3AaRi6YJ2uFlrvyr0YhRTjDLRy1EmdhvC6tIbPl7ExU fPMMreMsG+Uw2aK3YoDwFaWalCmUwYcq0Oaq3beVGfnV922LQrs1eqsyZKaT+Rcv+jvt Aeust67aUKMKRVR4/4Q7NzZ5gAtLuKYBo24D1bDixlgLhSOgsSzF7jxbSyBiAk89mQ7M RCsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OQwuQRuA; 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=pass (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 xi3-20020a170906dac300b0084c3a089f39si6650543ejb.350.2023.01.12.03.42.46; Thu, 12 Jan 2023 03:43:12 -0800 (PST) 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; dkim=pass header.i=@intel.com header.s=Intel header.b=OQwuQRuA; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235804AbjALLhd (ORCPT + 99 others); Thu, 12 Jan 2023 06:37:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232019AbjALLgV (ORCPT ); Thu, 12 Jan 2023 06:36:21 -0500 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C330B10073 for ; Thu, 12 Jan 2023 03:28:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673522918; x=1705058918; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=C4Q7t6S4036xeiDu5xxCUyx970NCpXYQ7LpyZ8TZ13k=; b=OQwuQRuAI0oWu1tRqs5zY9WFfeOvyt1YYsO/qZPnMQ6tWN7Vd2FjsvE3 L1h22ULXqTeYCYW89EaPM31TDr25kHpJFXSV0VuiRYCw1g2HT1SLszSB9 NxZjKztg3YE+0khNAsTvBTXc3TuCzE+u9Bpm4zvb/C5rRzCXP7pheURqo KS9y5rBbUWBXGRWRuJn7l624MuDoy25zD2uKA5SeGJZxyJBkRbs1QgDyv JuF/dOKzIbyDxhylOUYxZ5zwx7z0zjn7rBmSLPQWqeu6Swhm532mejl1t cvIxS3U6ISHKlWqBr1XmomwutV+IeAKovUedATPZL3LsHSEB/c/t8bpfB g==; X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="385994962" X-IronPort-AV: E=Sophos;i="5.96,319,1665471600"; d="scan'208";a="385994962" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 03:28:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="986519418" X-IronPort-AV: E=Sophos;i="5.96,319,1665471600"; d="scan'208";a="986519418" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 12 Jan 2023 03:28:22 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 72458E1; Thu, 12 Jan 2023 13:28:56 +0200 (EET) From: Andy Shevchenko To: Mark Brown , Hans de Goede , Pierre-Louis Bossart , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Cezary Rojewski , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Jaroslav Kysela , Takashi Iwai , Andy Shevchenko Subject: [PATCH v2 1/5] ASoC: Intel: bytcht_es8316: Drop reference count of ACPI device after use Date: Thu, 12 Jan 2023 13:28:48 +0200 Message-Id: <20230112112852.67714-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230112112852.67714-1-andriy.shevchenko@linux.intel.com> References: <20230112112852.67714-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754816885153919425?= X-GMAIL-MSGID: =?utf-8?q?1754816885153919425?= Theoretically the device might gone if its reference count drops to 0. This might be the case when we try to find the first physical node of the ACPI device. We need to keep reference to it until we get a result of the above mentioned call. Refactor the code to drop the reference count at the correct place. While at it, move to acpi_dev_put() as symmetrical call to the acpi_dev_get_first_match_dev(). Fixes: 3c22a73fb873 ("ASoC: Intel: bytcht_es8316: fix HID handling") Signed-off-by: Andy Shevchenko --- sound/soc/intel/boards/bytcht_es8316.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 09d1f0f6d686..df157b01df8b 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -497,21 +497,28 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) if (adev) { snprintf(codec_name, sizeof(codec_name), "i2c-%s", acpi_dev_name(adev)); - put_device(&adev->dev); byt_cht_es8316_dais[dai_index].codecs->name = codec_name; } else { dev_err(dev, "Error cannot find '%s' dev\n", mach->id); return -ENXIO; } + codec_dev = acpi_get_first_physical_node(adev); + acpi_dev_put(adev); + if (!codec_dev) + return -EPROBE_DEFER; + priv->codec_dev = get_device(codec_dev); + /* override platform name, if required */ byt_cht_es8316_card.dev = dev; platform_name = mach->mach_params.platform; ret = snd_soc_fixup_dai_links_platform_name(&byt_cht_es8316_card, platform_name); - if (ret) + if (ret) { + put_device(codec_dev); return ret; + } /* Check for BYTCR or other platform and setup quirks */ dmi_id = dmi_first_match(byt_cht_es8316_quirk_table); @@ -539,13 +546,10 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) /* get the clock */ priv->mclk = devm_clk_get(dev, "pmc_plt_clk_3"); - if (IS_ERR(priv->mclk)) + if (IS_ERR(priv->mclk)) { + put_device(codec_dev); return dev_err_probe(dev, PTR_ERR(priv->mclk), "clk_get pmc_plt_clk_3 failed\n"); - - codec_dev = acpi_get_first_physical_node(adev); - if (!codec_dev) - return -EPROBE_DEFER; - priv->codec_dev = get_device(codec_dev); + } if (quirk & BYT_CHT_ES8316_JD_INVERTED) props[cnt++] = PROPERTY_ENTRY_BOOL("everest,jack-detect-inverted");