1 files changed, 32 insertions, 5 deletions

diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
index e6a2c3b302d..0edd618b9dd 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -20,7 +20,9 @@
 
 #include <linux/types.h>
 #include <linux/ioctl.h>
+#include <linux/module.h>
 #include <linux/i2c.h>
+#include <linux/slab.h>
 #if defined(CONFIG_SPI)
 #include <linux/spi/spi.h>
 #endif
@@ -193,6 +195,13 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
 }
 EXPORT_SYMBOL_GPL(v4l2_device_register_subdev);
 
+static void v4l2_device_release_subdev_node(struct video_device *vdev)
+{
+        struct v4l2_subdev *sd = video_get_drvdata(vdev);
+        sd->devnode = NULL;
+        kfree(vdev);
+}
+
 int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)
 {
         struct video_device *vdev;
@@ -206,22 +215,40 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)
                 if (!(sd->flags & V4L2_SUBDEV_FL_HAS_DEVNODE))
                         continue;
 
-                vdev = &sd->devnode;
+                vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
+                if (!vdev) {
+                        err = -ENOMEM;
+                        goto clean_up;
+                }
+
+                video_set_drvdata(vdev, sd);
                 strlcpy(vdev->name, sd->name, sizeof(vdev->name));
                 vdev->v4l2_dev = v4l2_dev;
                 vdev->fops = &v4l2_subdev_fops;
-                vdev->release = video_device_release_empty;
+                vdev->release = v4l2_device_release_subdev_node;
                 vdev->ctrl_handler = sd->ctrl_handler;
                 err = __video_register_device(vdev, VFL_TYPE_SUBDEV, -1, 1,
                                               sd->owner);
-                if (err < 0)
-                        return err;
+                if (err < 0) {
+                        kfree(vdev);
+                        goto clean_up;
+                }
 #if defined(CONFIG_MEDIA_CONTROLLER)
                 sd->entity.v4l.major = VIDEO_MAJOR;
                 sd->entity.v4l.minor = vdev->minor;
 #endif
+                sd->devnode = vdev;
         }
         return 0;
+
+clean_up:
+        list_for_each_entry(sd, &v4l2_dev->subdevs, list) {
+                if (!sd->devnode)
+                        break;
+                video_unregister_device(sd->devnode);
+        }
+
+        return err;
 }
 EXPORT_SYMBOL_GPL(v4l2_device_register_subdev_nodes);
 
@@ -247,7 +274,7 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)
         if (v4l2_dev->mdev)
                 media_device_unregister_entity(&sd->entity);
 #endif
-        video_unregister_device(&sd->devnode);
+        video_unregister_device(sd->devnode);
         module_put(sd->owner);
 }
 EXPORT_SYMBOL_GPL(v4l2_device_unregister_subdev);