Skip to content

Commit

Permalink
OMAPDSS: VENC: fix NULL pointer dereference in DSS2 VENC sysfs debug …
Browse files Browse the repository at this point in the history
…attr on OMAP4

Commit ba02fa3 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>
  • Loading branch information
Danny Kukawka authored and Tomi Valkeinen committed Jan 25, 2012
1 parent 1149c74 commit cc1d3e0
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/video/omap2/dss/venc.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,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;

Expand Down

0 comments on commit cc1d3e0

Please sign in to comment.