mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-27 06:18:13 +00:00
Koen Kooi
189ce92b4c
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From ad7129ee930fa9b9efd04490a4ddcd5d5a9039a9 Mon Sep 17 00:00:00 2001
|
|
From: Danny Kukawka <danny.kukawka@bisect.de>
|
|
Date: Tue, 24 Jan 2012 16:44:42 +0100
|
|
Subject: [PATCH 085/117] OMAPDSS: VENC: fix NULL pointer dereference in DSS2
|
|
VENC sysfs debug attr on OMAP4
|
|
|
|
commit cc1d3e032df53d83d0ca4d537d8eb67eb5b3e808 upstream.
|
|
|
|
Commit ba02fa37de80bea10d706f39f076dd848348320a disabled the
|
|
venc driver registration on OMAP4. Since the driver never gets
|
|
probed/initialised your get a dereferenceed NULL pointer if you
|
|
try to get info from /sys/kernel/debug/omapdss/venc
|
|
|
|
Return info message about disabled venc if venc_dump_regs() gets called.
|
|
|
|
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
|
|
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/video/omap2/dss/venc.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
|
|
index 7533458..7152b53 100644
|
|
--- a/drivers/video/omap2/dss/venc.c
|
|
+++ b/drivers/video/omap2/dss/venc.c
|
|
@@ -679,6 +679,11 @@ void venc_dump_regs(struct seq_file *s)
|
|
{
|
|
#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r))
|
|
|
|
+ if (cpu_is_omap44xx()) {
|
|
+ seq_printf(s, "VENC currently disabled on OMAP44xx\n");
|
|
+ return;
|
|
+ }
|
|
+
|
|
if (venc_runtime_get())
|
|
return;
|
|
|
|
--
|
|
1.7.9.5
|
|
|