[media] media: fix truncated entity specification

[linux-imx.git] / drivers / media / video / v4l2-dev.c

diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index a5c9ed128b974aaac3e4cba8ac03e4a2292d77d4..96e9615663e9d912b8868719b7c53d5ca73cfae6 100644 (file)
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -146,10 +146,9 @@ static void v4l2_device_release(struct device *cd)
        struct v4l2_device *v4l2_dev = vdev->v4l2_dev;
 
        mutex_lock(&videodev_lock);
-       if (video_device[vdev->minor] != vdev) {
-               mutex_unlock(&videodev_lock);
+       if (WARN_ON(video_device[vdev->minor] != vdev)) {
                /* should not happen */
-               WARN_ON(1);
+               mutex_unlock(&videodev_lock);
                return;
        }
 
@@ -168,7 +167,7 @@ static void v4l2_device_release(struct device *cd)
        mutex_unlock(&videodev_lock);
 
 #if defined(CONFIG_MEDIA_CONTROLLER)
-       if (vdev->v4l2_dev && vdev->v4l2_dev->mdev &&
+       if (v4l2_dev && v4l2_dev->mdev &&
            vdev->vfl_type != VFL_TYPE_SUBDEV)
                media_device_unregister_entity(&vdev->entity);
 #endif
@@ -556,8 +555,7 @@ int __video_register_device(struct video_device *vdev, int type, int nr,
        vdev->minor = -1;
 
        /* the release callback MUST be present */
-       WARN_ON(!vdev->release);
-       if (!vdev->release)
+       if (WARN_ON(!vdev->release))
                return -EINVAL;
 
        /* v4l2_fh support */
@@ -703,8 +701,8 @@ int __video_register_device(struct video_device *vdev, int type, int nr,
            vdev->vfl_type != VFL_TYPE_SUBDEV) {
                vdev->entity.type = MEDIA_ENT_T_DEVNODE_V4L;
                vdev->entity.name = vdev->name;
-               vdev->entity.v4l.major = VIDEO_MAJOR;
-               vdev->entity.v4l.minor = vdev->minor;
+               vdev->entity.info.v4l.major = VIDEO_MAJOR;
+               vdev->entity.info.v4l.minor = vdev->minor;
                ret = media_device_register_entity(vdev->v4l2_dev->mdev,
                        &vdev->entity);
                if (ret < 0)