Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-05 18:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Dmitry Osipenko 2018-05-29 18:41:06 -04:00 committed by Mauro Carvalho Chehab
parent fc6c19fb71
commit f956aec08d
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/media/tegra-vde/tegra-vde.c
View File

@ -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);