diff options
| author | Dmitry Osipenko <digetx@gmail.com> | 2018-05-30 00:41:06 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-06-05 15:49:24 +0200 |
| commit | f956aec08d2b989dcf4699c15de8cd465929b750 (patch) | |
| tree | afb6067146d75a48423eba63a3178b1bef646e03 /drivers | |
| parent | media: marvel-ccic: mmp: select VIDEOBUF2_VMALLOC/DMA_CONTIG (diff) | |
| download | linux-f956aec08d2b989dcf4699c15de8cd465929b750.tar.xz linux-f956aec08d2b989dcf4699c15de8cd465929b750.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/media/tegra-vde/tegra-vde.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/media/tegra-vde/tegra-vde.c b/drivers/staging/media/tegra-vde/tegra-vde.c index 6dd3bf4481be..6f06061a40d9 100644 --- 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); |