1 files changed, 2 insertions, 14 deletions

diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index fda48a2efda6..ff219df4b725 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -84,11 +84,6 @@ static void video_release(struct device *cd)
 {
         struct video_device *vfd = container_of(cd, struct video_device, dev);
 
-#if 1
-        /* needed until all drivers are fixed */
-        if (!vfd->release)
-                return;
-#endif
         vfd->release(vfd);
 }
 
@@ -233,8 +228,8 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
         int ret;
         char *name_base;
 
-        if (vfd == NULL)
-                return -EINVAL;
+        /* the release callback MUST be present */
+        BUG_ON(!vfd->release);
 
         if (vfd == NULL)
                 return -EINVAL;
@@ -312,13 +307,6 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
                 goto fail_minor;
         }
 
-#if 1
-        /* needed until all drivers are fixed */
-        if (!vfd->release)
-                printk(KERN_WARNING "videodev: \"%s\" has no release callback. "
-                       "Please fix your driver for proper sysfs support, see "
-                       "http://lwn.net/Articles/36850/\n", vfd->name);
-#endif
         return 0;
 
 fail_minor: