mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
media: tegra-vde: Refactor timeout handling
Reorder the branches a bit, so cocci stops complaining about the code. drivers/media/platform/nvidia/tegra-vde/h264.c:645:20-21: WARNING opportunity for min() Link: https://lore.kernel.org/linux-media/20240429-fix-cocci-v3-20-3c4865f5a4b0@chromium.org Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
1d3eb44a97
commit
7d6a8e8aa5
1 changed files with 3 additions and 3 deletions
|
@ -633,7 +633,9 @@ static int tegra_vde_decode_end(struct tegra_vde *vde)
|
|||
|
||||
timeout = wait_for_completion_interruptible_timeout(
|
||||
&vde->decode_completion, msecs_to_jiffies(1000));
|
||||
if (timeout == 0) {
|
||||
if (timeout < 0) {
|
||||
ret = timeout;
|
||||
} else if (timeout == 0) {
|
||||
bsev_ptr = tegra_vde_readl(vde, vde->bsev, 0x10);
|
||||
macroblocks_nb = tegra_vde_readl(vde, vde->sxe, 0xC8) & 0x1FFF;
|
||||
read_bytes = bsev_ptr ? bsev_ptr - vde->bitstream_data_addr : 0;
|
||||
|
@ -642,8 +644,6 @@ static int tegra_vde_decode_end(struct tegra_vde *vde)
|
|||
read_bytes, macroblocks_nb);
|
||||
|
||||
ret = -EIO;
|
||||
} else if (timeout < 0) {
|
||||
ret = timeout;
|
||||
} else {
|
||||
ret = 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue