From patchwork Thu Jan 12 11:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 42387 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3832612wrt; Thu, 12 Jan 2023 03:42:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXtsIv5xTDwd0ymPslGPS9u7fMBaYMiRUw2Zk/3BxVR3IXyrEE5PrZ1UViY9/kEvlpKphBYV X-Received: by 2002:a17:907:a588:b0:84d:43e4:3633 with SMTP id vs8-20020a170907a58800b0084d43e43633mr13642717ejc.36.1673523731759; Thu, 12 Jan 2023 03:42:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673523731; cv=none; d=google.com; s=arc-20160816; b=NKlxdZhGaqKdM4/vNJTxPBzJ6wCWomNltMo6HL6VCLcXUwFB/exuUtdsRMwV5xwQ4B DwkU3NM45IXH20fvtEagqLSj++1oaDye96+4u7GwOZu+r3aCsYteYRl5dl61ZC663Twh mh23XvYXvSsYgdOXV2BSf42M/inwaCek1+tz/N/bcrdCpQOr0sPYtkrtBfVVENjGX9E7 AFKX/S5e0N8X/2c73wAmnhB0Mnn0FRlekw0nOCOfKNfy7R7vGB1NTucmZN8g+iKFWFl7 SEpxby1qQrl2Kw0FGWumMclXWM4/jKc6lQR+v7ZaATZ0lrPF62DJcVf5KxBEkhK5xehE PkgQ== 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=MWE1RtDFVUobfO7E5AC5vMtxHaFnxJLcrhzKNFk54/s=; b=ntyZI4oruPoUvFq/W8DlZKf09++6vUZOAvEm4t+8jNOA/nrIv+gjyJ4YcVRee2MSpw 0r4gDB+K00A1bN3emimWXxREIRRyslEzoQZRbsBhZI2G7aXX6SPpDINUUoCs1zpS1Eym /yFLt/a4lAYB4Kq3oEzQ//Y0XaB35ZFBTOMmHZ0Rh8dGmJMDS66abbrJguHcrhY49OK4 oxyOg+aUkfWgDy3SSsKSxWVAv606m+LH410T1OjaTAJcJAIiaqrle952gr4Gh9EM6oXi 9oLWhqNcl1w4mQrFu1bJqudUeDhF//bTAq1rtd7OSgkq26Jsw7GA79pJ4v3RLtqhv06L o18w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iViLhaW3; 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 xe1-20020a170907318100b0084d3360e59csi15008434ejb.601.2023.01.12.03.41.46; Thu, 12 Jan 2023 03:42:11 -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=iViLhaW3; 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 S233117AbjALLhV (ORCPT + 99 others); Thu, 12 Jan 2023 06:37:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232322AbjALLgR (ORCPT ); Thu, 12 Jan 2023 06:36:17 -0500 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E44B2FCEF for ; Thu, 12 Jan 2023 03:28:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673522913; x=1705058913; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BrwpZf0Qi8AA+i94wAgY34Wsc5QpYESR4OVN/jMXpfw=; b=iViLhaW3V5/17PQ6MYY8OqWw0t289rwZZmLTzSz+i4ovuWBnQWg7Jl0y aRYQzq7DDCVoPRHZGB3oN+HbX8Zwp/M1Njn+RBdrAI+d17I6Va2v/ZtoO jYfDj6stPS06CcNvJW+OJU3hsOffng24FR747ncy33A0FKdR8wrAc1WaM YSenvDKqSkVyXl9ucllARarf5tfYyaIYU3qnEoSU8Ws7XrW+OTT4V/fkn yIYU+BXBzhAEPz089bdW3xkAPeQsnzY6pAYlnQ6KxfU82EFRDbUgRipAO YuxhrMelGLF2FsIHHylJDLm6q0x+HjCK+rNprlGg3FZd1sW1jj02nxmIG A==; X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="385994955" X-IronPort-AV: E=Sophos;i="5.96,319,1665471600"; d="scan'208";a="385994955" 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:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="986519424" X-IronPort-AV: E=Sophos;i="5.96,319,1665471600"; d="scan'208";a="986519424" 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 8AF4831D; 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 3/5] ASoC: Intel: bytcr_rt5640: Drop reference count of ACPI device after use Date: Thu, 12 Jan 2023 13:28:50 +0200 Message-Id: <20230112112852.67714-4-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?1754816820688241751?= X-GMAIL-MSGID: =?utf-8?q?1754816820688241751?= 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: a232b96dcece ("ASoC: Intel: bytcr_rt5640: use HID translation util") Signed-off-by: Andy Shevchenko --- sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 4699ca79f3ea..79e0039c79a3 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -1636,13 +1636,18 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) if (adev) { snprintf(byt_rt5640_codec_name, sizeof(byt_rt5640_codec_name), "i2c-%s", acpi_dev_name(adev)); - put_device(&adev->dev); byt_rt5640_dais[dai_index].codecs->name = byt_rt5640_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); + /* * swap SSP0 if bytcr is detected * (will be overridden if DMI quirk is detected) @@ -1717,11 +1722,6 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) byt_rt5640_quirk = quirk_override; } - codec_dev = acpi_get_first_physical_node(adev); - if (!codec_dev) - return -EPROBE_DEFER; - priv->codec_dev = get_device(codec_dev); - if (byt_rt5640_quirk & BYT_RT5640_JD_HP_ELITEP_1000G2) { acpi_dev_add_driver_gpios(ACPI_COMPANION(priv->codec_dev), byt_rt5640_hp_elitepad_1000g2_gpios);