4 files changed, 6 insertions, 7 deletions

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 6edc9ba81203..6f9eb94e85b3 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -108,8 +108,7 @@ static long media_device_enum_entities(struct media_device *mdev,
         u_ent.group_id = ent->group_id;
         u_ent.pads = ent->num_pads;
         u_ent.links = ent->num_links - ent->num_backlinks;
-        u_ent.v4l.major = ent->v4l.major;
-        u_ent.v4l.minor = ent->v4l.minor;
+        memcpy(&u_ent.raw, &ent->info, sizeof(ent->info));
         if (copy_to_user(uent, &u_ent, sizeof(u_ent)))
                 return -EFAULT;
         return 0;
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 6a07d283456b..96e9615663e9 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -701,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)
diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
index 0edd618b9ddf..1f203b85a637 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -234,8 +234,8 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)
                         goto clean_up;
                 }
 #if defined(CONFIG_MEDIA_CONTROLLER)
-                sd->entity.v4l.major = VIDEO_MAJOR;
-                sd->entity.v4l.minor = vdev->minor;
+                sd->entity.info.v4l.major = VIDEO_MAJOR;
+                sd->entity.info.v4l.minor = vdev->minor;
 #endif
                 sd->devnode = vdev;
         }
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index cd8bca63a502..29e7bba78ffe 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -98,7 +98,7 @@ struct media_entity {
 
                 /* Sub-device specifications */
                 /* Nothing needed yet */
-        };
+        } info;
 };
 
 static inline u32 media_entity_type(struct media_entity *entity)