From patchwork Mon Jan 2 20:30:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 38190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4305296wrt; Mon, 2 Jan 2023 12:31:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXt56osp7JUTHwhfU/O6ntZSqSDoyLRIGiuFfjpR7aW8pYbUtemNLbvb8YRuNoXclZrgIOAk X-Received: by 2002:a05:6402:4013:b0:47e:869:9115 with SMTP id d19-20020a056402401300b0047e08699115mr9004266eda.3.1672691509554; Mon, 02 Jan 2023 12:31:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672691509; cv=none; d=google.com; s=arc-20160816; b=j0im4Ti3dw4Nx7tXdWPf8ZgZ8rkIJrsau/A/UJ9BDmN6TfpE3dyNhB4ovzgryofy0f xbEaq9YsBBv485NlarzKz9xEFlxKJK4Yrr2ecY7gPmdYAPYaUa/lzG7rd28VAI7UjEs4 uiBTG+sI5mWcFgH6nBC1WWIKeM6+FJNWJ3JfZL+O0otdceGlVXT69NmGCG0Xiz3v487o 04WNLtMripQd32QxKQItPuIYtxEHttWyx7Du8t2lbjB/HrMeZX5RrnZ//OMAbITdJ9sL Uwdp/suwAxuZ2jZXp9bjL/UX7+bYfv61YB8ADRL8eJJA9kG1aE7tijk1HohnzUAImwzv QYjg== 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=rBnjsvJ+ORALn3yChF+iiOtRb58Z60gnnnKAEnJrQf0=; b=aYyBkeLNAvzeT0NgvCTVU8Z6z62PO/h9waYC1EimXpqLPNlO0gwHSlCtxxX21jwXw0 r19yw7G0AUahUoxJw9z0gDYSqQXKt4HqObnQ9iy2oAxTuWmycnESfikBilXGLEzwTDIA 3o6ki8VqlSLeCr5Np3MEbgudHVtgQKyaqoEKKOtQ/VpqHftBBnLlKdRG6zZNk1/HK2aA 7epua2vJqBc8jCDvlRdNxB/F34JJaiuwyQm1ex0kqRsEU2bDe2He5zXc242QolkyVHbL s7FOgyWmO98L7V6o5zxVyew24wXRkI5vVPEoF1EH5Su/AhucTmKRtQ+wvI1XXlskkOvJ weNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kJrhSTq3; 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 b11-20020a056402350b00b004854e1d2682si21382653edd.249.2023.01.02.12.31.25; Mon, 02 Jan 2023 12:31:49 -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=kJrhSTq3; 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 S236395AbjABUbA (ORCPT + 99 others); Mon, 2 Jan 2023 15:31:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236249AbjABUaK (ORCPT ); Mon, 2 Jan 2023 15:30:10 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5620ABCBD for ; Mon, 2 Jan 2023 12:30:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672691409; x=1704227409; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LwgfX1nuvuxjaGMvY2eRkuLAJY23wtVpSS451UENzDA=; b=kJrhSTq3w1elRqTLabgpWfuvpzrp5CQ2ca71fluSeckzFMftxVi77T8n oqdnePnP9xgXJZqzrJWmO6Tl/BTTemJxOsFJ28tEZ1SjsUTddvN9+3zCO QUEmiM1blHpyQFFe6RAFvYoDpRCGFl7NQBPuiqpLE8tiwkhHWcJ+CcS/K F8TU6hoF+mZzRaZxjAGJeYkiDjBmwhOo6570Q8qQuckE/ujHmNp9wHPn5 PV+PdjKZVyM0MlzeiGF1FAn0rEP4YjdV2bEyD4wFpAde/KYmNuOd63qbE k9kke1/ooqmq8GUC8cujElxUFOxm30MENEFrjddNvwpaoSqyeqwLAq6Ih A==; X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="320252197" X-IronPort-AV: E=Sophos;i="5.96,295,1665471600"; d="scan'208";a="320252197" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jan 2023 12:29:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="685170321" X-IronPort-AV: E=Sophos;i="5.96,295,1665471600"; d="scan'208";a="685170321" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 02 Jan 2023 12:29:49 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id E10DD220; Mon, 2 Jan 2023 22:30:16 +0200 (EET) From: Andy Shevchenko To: Mark Brown , Vijendar Mukunda , Hans de Goede , Pierre-Louis Bossart , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Cezary Rojewski , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Andy Shevchenko Subject: [PATCH v1 6/6] ASoC: Intel: sof_es8336: Drop reference count of ACPI device after use Date: Mon, 2 Jan 2023 22:30:14 +0200 Message-Id: <20230102203014.16041-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230102203014.16041-1-andriy.shevchenko@linux.intel.com> References: <20230102203014.16041-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?1753944172513254191?= X-GMAIL-MSGID: =?utf-8?q?1753944172513254191?= 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: a164137ce91a ("ASoC: Intel: add machine driver for SOF+ES8336") Signed-off-by: Andy Shevchenko --- sound/soc/intel/boards/sof_es8336.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index 773e5d1d87d4..894b6610b9e2 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -681,7 +681,6 @@ static int sof_es8336_probe(struct platform_device *pdev) if (adev) { snprintf(codec_name, sizeof(codec_name), "i2c-%s", acpi_dev_name(adev)); - put_device(&adev->dev); dai_links[0].codecs->name = codec_name; /* also fixup codec dai name if relevant */ @@ -692,16 +691,19 @@ static int sof_es8336_probe(struct platform_device *pdev) return -ENXIO; } - ret = snd_soc_fixup_dai_links_platform_name(&sof_es8336_card, - mach->mach_params.platform); - if (ret) - return ret; - 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); + ret = snd_soc_fixup_dai_links_platform_name(&sof_es8336_card, + mach->mach_params.platform); + if (ret) { + put_device(codec_dev); + return ret; + } + if (quirk & SOF_ES8336_JD_INVERTED) props[cnt++] = PROPERTY_ENTRY_BOOL("everest,jack-detect-inverted");