* [PATCH] venus: Check for valid device instance
@ 2021-01-13 0:26 Fritz Koenig
0 siblings, 0 replies; only message in thread
From: Fritz Koenig @ 2021-01-13 0:26 UTC (permalink / raw)
To: linux-media, linux-arm-msm, linux-kernel, stanimir.varbanov,
vgarodia, dikshita, acourbot
Cc: Fritz Koenig
core->dev_dec and core-dev->enc are set up
by the corresponding vdec_probe and venc_probe.
If the probe fails, they will not be set
and so could be null when venus_sys_error_handler
is called.
Fixes: 43e221e485e5 ("media: venus: Rework recovery mechanism")
Signed-off by: Fritz Koenig <frkoenig@chromium.org>
---
drivers/media/platform/qcom/venus/core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index bdd293faaad0..979fcada4d3b 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -62,7 +62,8 @@ static void venus_sys_error_handler(struct work_struct *work)
mutex_lock(&core->lock);
- while (pm_runtime_active(core->dev_dec) || pm_runtime_active(core->dev_enc))
+ while ((core->dev_dec && pm_runtime_active(core->dev_dec)) ||
+ (core->dev_enc && pm_runtime_active(core->dev_enc)))
msleep(10);
venus_shutdown(core);
--
2.30.0.284.gd98b1dd5eaa7-goog
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-13 0:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-13 0:26 [PATCH] venus: Check for valid device instance Fritz Koenig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).