Skip to contentSkip to conversation

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

PATCH New Dmitry Osipenko 1 participant 1 message May 29, 2018

Subsystems (3)
Media (V4L/DVB) Staging Tegra architecture support
lore
Share & tools
lore

Dmitry Osipenko

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/staging/media/tegra-vde/tegra-vde.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/staging/media/tegra-vde/tegra-vde.c +5 -8
index 6dd3bf4481be..6f06061a40d9 100644
@@ -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);
Signature · 1 line
2.17.0