lkml.org 
[lkml]   [2012]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 086/117] OMAPDSS: VENC: fix NULL pointer dereference in DSS2 VENC sysfs debug attr on OMAP4
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Danny Kukawka <danny.kukawka@bisect.de>

    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 b3e9f90..82865be 100644
    --- a/drivers/video/omap2/dss/venc.c
    +++ b/drivers/video/omap2/dss/venc.c
    @@ -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;




    \
     
     \ /
      Last update: 2012-05-28 06:01    [W:3.922 / U:0.712 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site