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: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/staging/media/tegra-vde/tegra-vde.c b/drivers/staging/media/tegra-vde/tegra-vde.c
index 6dd3bf4481be7fc506c9a5da23ffcc03fd77d3c1..6f06061a40d9b586ee525c2091114a747e5e12b6 100644 (file)
--- a/drivers/staging/media/tegra-vde/tegra-vde.c
+++ b/drivers/staging/media/tegra-vde/tegra-vde.c
@@ -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 {
+       if (err)
                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);