Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7534f00 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: Release module if subdev registration fails 



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

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: stable@kernel.org
Acked-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b7300110

drivers/media/video/v4l2-device.c

+4 −1
Original line number Diff line number Diff line
@@ -155,15 +155,18 @@ 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 */

	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;

	}