Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f956aec0 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Mauro Carvalho Chehab
Browse files

media: staging: tegra-vde: Reset VDE regardless of memory client resetting failure 



A failed memory client reset doesn't prevent VDE from resetting, hence
reset VDE regardless of preceding memory client resetting failure.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent fc6c19fb

drivers/staging/media/tegra-vde/tegra-vde.c

+5 −8
Original line number Diff line number Diff line
@@ -901,15 +901,12 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde *vde, 
	 * the whole system.

	 */

	err = reset_control_assert(vde->rst_mc);

	if (!err) {

		err = reset_control_assert(vde->rst);

	if (err)

			dev_err(dev,

				"DEC end: Failed to assert HW reset: %d\n",

				err);

	} else {

		dev_err(dev, "DEC end: Failed to assert MC reset: %d\n", err);

	}



	err = reset_control_assert(vde->rst);

	if (err)

		dev_err(dev, "DEC end: Failed to assert HW reset: %d\n", err);



put_runtime_pm:

	pm_runtime_mark_last_busy(dev);