Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Kukawka <dkukawka@suse.de>2012-01-25 11:51:08 +0100
committerDanny Kukawka <dkukawka@suse.de>2012-01-25 11:51:08 +0100
commit0ed1465de6d51a31e4ea6261ccd72dbf1b875f80 (patch)
treea8cfbb08aa1cd8913c377227e06862a6606890f5
parent8d328fe49be74145d14308c46a8c33614ce603a6 (diff)
fix NULL pointer dereference in DSS2 VENC sysfs debug attr on OMAP4.rpm-3.2.0-2
-rw-r--r--drivers/video/omap2/dss/venc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 7533458ba4d2..7152b53d14c0 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;