lkml.org 
[lkml]   [2011]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[62/71] [media] v4l: Release module if subdev registration fails
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

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

    From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

    commit b7534f002d3c81d18abfbf57179d07d3ec763bb5 upstream.

    If v4l2_device_register_subdev() fails, the reference to the subdev
    module taken by the function isn't released. Fix this.

    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/media/video/v4l2-device.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/media/video/v4l2-device.c
    +++ b/drivers/media/video/v4l2-device.c
    @@ -131,14 +131,17 @@ int v4l2_device_register_subdev(struct v
    sd->v4l2_dev = v4l2_dev;
    if (sd->internal_ops && sd->internal_ops->registered) {
    err = sd->internal_ops->registered(sd);
    - if (err)
    + if (err) {
    + module_put(sd->owner);
    return err;
    + }
    }
    /* This just returns 0 if either of the two args is NULL */
    err = v4l2_ctrl_add_handler(v4l2_dev->ctrl_handler, sd->ctrl_handler);
    if (err) {
    if (sd->internal_ops && sd->internal_ops->unregistered)
    sd->internal_ops->unregistered(sd);
    + module_put(sd->owner);
    return err;
    }
    spin_lock(&v4l2_dev->lock);



    \
     
     \ /
      Last update: 2011-05-19 20:13    [W:4.162 / U:0.460 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site