From: Laurent Pinchart Date: Sun, 15 Jan 2017 19:05:30 +0000 (-0200) Subject: [media] v4l: subdev: Clean up properly in subdev devnode registration error path X-Git-Tag: v4.14-rc1~332^2~771 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=909aa003eb7239161f0fa5773878035ed1754cf4;p=platform%2Fkernel%2Flinux-rpi.git [media] v4l: subdev: Clean up properly in subdev devnode registration error path Set the subdev devnode pointer right after registration to ensure that later errors won't skip the subdev when unregistering all devnodes. Signed-off-by: Laurent Pinchart Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c index 62bbed7..f364cc1 100644 --- a/drivers/media/v4l2-core/v4l2-device.c +++ b/drivers/media/v4l2-core/v4l2-device.c @@ -253,6 +253,7 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev) kfree(vdev); goto clean_up; } + sd->devnode = vdev; #if defined(CONFIG_MEDIA_CONTROLLER) sd->entity.info.dev.major = VIDEO_MAJOR; sd->entity.info.dev.minor = vdev->minor; @@ -270,7 +271,6 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev) } } #endif - sd->devnode = vdev; } return 0;