Commit c09ffca5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

staging: media: tegra-video: use pm_runtime_resume_and_get() 



Commit dd8088d5 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter")
added pm_runtime_resume_and_get() in order to automatically handle
dev->power.usage_count decrement on errors.

Use the new API, in order to cleanup the error check logic.

Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent dc8276b7

drivers/staging/media/tegra-video/csi.c

+1 −2
Original line number Diff line number Diff line
@@ -298,10 +298,9 @@ static int tegra_csi_enable_stream(struct v4l2_subdev *subdev) 
	struct tegra_csi *csi = csi_chan->csi;

	int ret, err;



	ret = pm_runtime_get_sync(csi->dev);

	ret = pm_runtime_resume_and_get(csi->dev);

	if (ret < 0) {

		dev_err(csi->dev, "failed to get runtime PM: %d\n", ret);

		pm_runtime_put_noidle(csi->dev);

		return ret;

	}

drivers/staging/media/tegra-video/vi.c

+1 −2
Original line number Diff line number Diff line
@@ -297,10 +297,9 @@ static int tegra_channel_start_streaming(struct vb2_queue *vq, u32 count) 
	struct tegra_vi_channel *chan = vb2_get_drv_priv(vq);

	int ret;



	ret = pm_runtime_get_sync(chan->vi->dev);

	ret = pm_runtime_resume_and_get(chan->vi->dev);

	if (ret < 0) {

		dev_err(chan->vi->dev, "failed to get runtime PM: %d\n", ret);

		pm_runtime_put_noidle(chan->vi->dev);

		return ret;

	}