On Wednesday, March 30, 2011 09:48:21 Laurent Pinchart wrote:
> 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.pinch...@ideasonboard.com>

Acked-by: Hans Verkuil <hverk...@xs4all.nl>

That is definitely for 2.6.39.

Regards,

        Hans

> ---
>  drivers/media/video/v4l2-device.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/media/video/v4l2-device.c 
> b/drivers/media/video/v4l2-device.c
> index 5aeaf87..4aae501 100644
> --- a/drivers/media/video/v4l2-device.c
> +++ b/drivers/media/video/v4l2-device.c
> @@ -155,8 +155,10 @@ int v4l2_device_register_subdev(struct v4l2_device 
> *v4l2_dev,
>       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 */
> @@ -164,6 +166,7 @@ int v4l2_device_register_subdev(struct v4l2_device 
> *v4l2_dev,
>       if (err) {
>               if (sd->internal_ops && sd->internal_ops->unregistered)
>                       sd->internal_ops->unregistered(sd);
> +             module_put(sd->owner);
>               return err;
>       }
>  
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to