Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp7075949ybi; Thu, 13 Jun 2019 09:09:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqzE8fcCtZAAFQczeS8mbr4jyqr9FYLBrOXtXec+0QpqSkF74lX6VwEF5azHIpr6ksn637YG X-Received: by 2002:a17:90a:730b:: with SMTP id m11mr6332018pjk.89.1560442184717; Thu, 13 Jun 2019 09:09:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560442184; cv=none; d=google.com; s=arc-20160816; b=O4PFDBMtEIoNaptoPeslTbmpTPDOFti0FQ+qNm1LCd2kpWUmt1xtNuqoO2eUTm4B4N zqToENJf5XIijLZoIcDBH/MV0trTxLP6O33HaSH4sGb8IxKs3mC1I1M5IdbfbvWUTc3I A7q64gEuda3t3Zwp7kIbSa3/la884RK0mD8kS8SuBTxiRGG9Y8+oQV/kBMcPxAEk/HhD ykfriwgDaGNaJuDWPRBschx5XmmcpvqYTdziLwc4ygjPu/R4HSCCsmaXUjjznjDvCreX YSO/2FkCp8gOhhHKU7KrPTwKF5MglX0pjmSMsidS+ihvg4HC+7QM21nq1/cazxFMWJbt XeJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Gi3ebhfzAcxGcd9vOogxeoDw5QBPwMoA6fAvTF1DVbE=; b=NfQV4U/tzM/2/TUHksP3jHFuQDrzDmpT+I+DDyW3b6x4Mr1JB6um+GppNJ1jQQSm7Y X3dNXCHXibGKmxWYEv4+Wxrqyz096ugNoABQ3IFJgikaAMLjKyy+bYmypV/GmwHb+K1n VZqcvxVDgqEecmLPdBKJ1RO5y1QJtvrtEXJxu+fsYc40QKEviCEyTmBmdHsLahbtSZpS V3zjGsIFXEjMdst3wswTyVdMhGtUHMpl7+yqTvFyrDKjkvalNvhCGYomvt7OsQxRsGPZ NVdK5ZGCk0tPS5G0AOsmTDGN/Q4mMvro/IG066z3qsQEbQ/sbdJ635yZIPlnfdnmkF6s WDKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RGQDEeqM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w10si133007pgl.288.2019.06.13.09.09.28; Thu, 13 Jun 2019 09:09:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RGQDEeqM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388193AbfFMQJZ (ORCPT + 99 others); Thu, 13 Jun 2019 12:09:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:33316 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731261AbfFMIoY (ORCPT ); Thu, 13 Jun 2019 04:44:24 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8712A2147A; Thu, 13 Jun 2019 08:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560415464; bh=CvVCdshDdxAb8HlNI9DNZSk1xA+E+MUtVLQAzyRkafA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RGQDEeqMMLB+fkeP6ySnQ+bA7S3sOwbxaAX3/OIJ8NgyFdAxL9JLC81BxdW6Yad/K 776bcF51jGLF/GvHsFRTVTbVBtqDe5Wj7t4orvup2U0WAmrK8le0CZFYQCIAnr7aCT 1l338jJOXx3Y+ZdKs+2NIEprXIPc9rIN8qcE0njs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonas Karlman , Boris Brezillon , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.1 003/155] media: rockchip/vpu: Add missing dont_use_autosuspend() calls Date: Thu, 13 Jun 2019 10:31:55 +0200 Message-Id: <20190613075652.897238917@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190613075652.691765927@linuxfoundation.org> References: <20190613075652.691765927@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 5c5b90f5cbad77dc15d8b5582efdb2e362bcd710 ] Those calls are needed to restore a clean PM state when the probe fails or when the driver is unloaded such that future ->probe() calls can initialize runtime PM again. Signed-off-by: Jonas Karlman Signed-off-by: Boris Brezillon Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c index 33b556b3f0df..d489b5dd54d7 100644 --- a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c +++ b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c @@ -492,6 +492,7 @@ err_v4l2_unreg: v4l2_device_unregister(&vpu->v4l2_dev); err_clk_unprepare: clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks); + pm_runtime_dont_use_autosuspend(vpu->dev); pm_runtime_disable(vpu->dev); return ret; } @@ -512,6 +513,7 @@ static int rockchip_vpu_remove(struct platform_device *pdev) v4l2_m2m_release(vpu->m2m_dev); v4l2_device_unregister(&vpu->v4l2_dev); clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks); + pm_runtime_dont_use_autosuspend(vpu->dev); pm_runtime_disable(vpu->dev); return 0; } -- 2.20.1