From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AC792210E5; Thu, 12 Dec 2024 16:20:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734020425; cv=none; b=HGXeSSliQ91ZjEbxKOscnBe19a9c13oJ5QXFUmx7MIjL2KXyX+Q9rXAljGa7/byVI1Ej68/qYwnH91WNmmgsG7dkbzBh2sBzSdhjUfKUYKTipHWom9Sbf8ADsqX19UIHePR6HSr1vyE4EBknUL1rMG4nRvHBFjqd3phMKsdQmmA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734020425; c=relaxed/simple; bh=M4u4a4KbCrXgV3EPU6+ZSTOnE4YL1VQHARBTSNQK8a0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PENb5ywRXHhuUzXB/tbo1F4w/Y2VRiyEGWVyYpNwinYp+MFk49PIi5MsNYEsPrdkHLMFveYTIJXerMLrZrpeMbdaoPkR7qBpiXQrBd0hW/sdRwSXw6rZ+CSHFGPlcAT+eeMQs95CEdmlUPjjYJ+ZchmwVX8dRZiH5Tb7h+H6WdA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=X/4XEipN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="X/4XEipN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1E57C4CED4; Thu, 12 Dec 2024 16:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734020425; bh=M4u4a4KbCrXgV3EPU6+ZSTOnE4YL1VQHARBTSNQK8a0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X/4XEipNyGCTrIPDPgZwMnNHlVu/zAr2SFEgIc89IG+iIfMzEKQ8wDIg2il3Xxe1Z BPCXD8xIiR66I/s1CA5Ow0hHGM27TaHkdDoyp5Drkpw2Q4DYmZxoevaK6Yg9MI/VRb mLgU01aIP4PM6MrWhblTCAl43DOYwErEMXTC4z+k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jinjie Ruan , Bryan ODonoghue , Sakari Ailus , Hans Verkuil Subject: [PATCH 6.1 465/772] media: amphion: Fix pm_runtime_set_suspended() with runtime pm enabled Date: Thu, 12 Dec 2024 15:56:50 +0100 Message-ID: <20241212144409.147793367@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jinjie Ruan commit 316e74500d1c6589cba28cebe2864a0bceeb2396 upstream. It is not valid to call pm_runtime_set_suspended() for devices with runtime PM enabled because it returns -EAGAIN if it is enabled already and working. So, call pm_runtime_disable() before to fix it. Cc: stable@vger.kernel.org Fixes: b50a64fc54af ("media: amphion: add amphion vpu device driver") Signed-off-by: Jinjie Ruan Reviewed-by: Bryan O'Donoghue Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/amphion/vpu_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/platform/amphion/vpu_drv.c +++ b/drivers/media/platform/amphion/vpu_drv.c @@ -151,8 +151,8 @@ err_add_decoder: media_device_cleanup(&vpu->mdev); v4l2_device_unregister(&vpu->v4l2_dev); err_vpu_deinit: - pm_runtime_set_suspended(dev); pm_runtime_disable(dev); + pm_runtime_set_suspended(dev); return ret; }