From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6113C43334 for ; Tue, 28 Jun 2022 02:25:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244364AbiF1CZI (ORCPT ); Mon, 27 Jun 2022 22:25:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243550AbiF1CWB (ORCPT ); Mon, 27 Jun 2022 22:22:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25894248D6; Mon, 27 Jun 2022 19:21:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B1A61B81C15; Tue, 28 Jun 2022 02:21:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04C52C34115; Tue, 28 Jun 2022 02:21:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656382900; bh=7+vAJRMgtUyHbUhQ3ZnX7OzDRmk02qzdXICIrnOXpPQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kLdOhpI2cwqrbQrajZkKuLpg7qNyYCkG+vnq0mE6ehJGXEvzgYvmazMnXR8yfS6XQ Yqmfya0+rjqKCI5ZyZ/WRkv/N+AumQ2HkMFekSUa9nA8LIV8VGsnhsId5s4/CUOioi TZCJ3p7lUeg3dUPIYr4cWExXRXfHcSLX6HGR4GzpMjur4CcjnJr+Mkw61a8pmf2k2X v75ty0B99pQtrnncI4W5nSH2OT3FpcZid8GcPuBcZ67fQo/3QOp513tOlZdjAz5bfw cbLFIEV8loK55BuMk/GpXCTyKtjmd3VIhjHZFbq9yCynqS90latO9YsJPKjxwVBY/Z 7FvHljPE2nfrg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pierre-Louis Bossart , Bard Liao , Kai Vehmanen , Ranjani Sridharan , Takashi Iwai , Sasha Levin , perex@perex.cz, tiwai@suse.com, jiasheng@iscas.ac.cn, gushengxian@yulong.com, nizhen@uniontech.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.15 15/41] ALSA: x86: intel_hdmi_audio: use pm_runtime_resume_and_get() Date: Mon, 27 Jun 2022 22:20:34 -0400 Message-Id: <20220628022100.595243-15-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220628022100.595243-1-sashal@kernel.org> References: <20220628022100.595243-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pierre-Louis Bossart [ Upstream commit bb30b453fedac277d66220431fd7063d9ddc10d8 ] The current code does not check for errors and does not release the reference on errors. Signed-off-by: Pierre-Louis Bossart Reviewed-by: Bard Liao Reviewed-by: Kai Vehmanen Reviewed-by: Ranjani Sridharan Link: https://lore.kernel.org/r/20220616222910.136854-3-pierre-louis.bossart@linux.intel.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/x86/intel_hdmi_audio.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index b16657de9d25..fea043ec42fe 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -1068,7 +1068,9 @@ static int had_pcm_open(struct snd_pcm_substream *substream) intelhaddata = snd_pcm_substream_chip(substream); runtime = substream->runtime; - pm_runtime_get_sync(intelhaddata->dev); + retval = pm_runtime_resume_and_get(intelhaddata->dev); + if (retval < 0) + return retval; /* set the runtime hw parameter with local snd_pcm_hardware struct */ runtime->hw = had_pcm_hardware; @@ -1549,8 +1551,12 @@ static void had_audio_wq(struct work_struct *work) container_of(work, struct snd_intelhad, hdmi_audio_wq); struct intel_hdmi_lpe_audio_pdata *pdata = ctx->dev->platform_data; struct intel_hdmi_lpe_audio_port_pdata *ppdata = &pdata->port[ctx->port]; + int ret; + + ret = pm_runtime_resume_and_get(ctx->dev); + if (ret < 0) + return; - pm_runtime_get_sync(ctx->dev); mutex_lock(&ctx->mutex); if (ppdata->pipe < 0) { dev_dbg(ctx->dev, "%s: Event: HAD_NOTIFY_HOT_UNPLUG : port = %d\n", -- 2.35.1