1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
index 7fe6f92af480..ce64fe16bc60 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -100,6 +100,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev)
                            is a platform bus, then it is never deleted. */
                         if (client)
                                 i2c_unregister_device(client);
+                        continue;
                 }
 #endif
 #if defined(CONFIG_SPI)
@@ -108,6 +109,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev)
 
                         if (spi)
                                 spi_unregister_device(spi);
+                        continue;
                 }
 #endif
         }
@@ -126,11 +128,19 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
         WARN_ON(sd->v4l2_dev != NULL);
         if (!try_module_get(sd->owner))
                 return -ENODEV;
+        sd->v4l2_dev = v4l2_dev;
+        if (sd->internal_ops && sd->internal_ops->registered) {
+                err = sd->internal_ops->registered(sd);
+                if (err)
+                        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 (err) {
+                if (sd->internal_ops && sd->internal_ops->unregistered)
+                        sd->internal_ops->unregistered(sd);
                 return err;
-        sd->v4l2_dev = v4l2_dev;
+        }
         spin_lock(&v4l2_dev->lock);
         list_add_tail(&sd->list, &v4l2_dev->subdevs);
         spin_unlock(&v4l2_dev->lock);
@@ -146,6 +156,8 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)
         spin_lock(&sd->v4l2_dev->lock);
         list_del(&sd->list);
         spin_unlock(&sd->v4l2_dev->lock);
+        if (sd->internal_ops && sd->internal_ops->unregistered)
+                sd->internal_ops->unregistered(sd);
         sd->v4l2_dev = NULL;
         module_put(sd->owner);
 }