[media] uvcvideo: Embed uvc_control_info inside struct uvc_control

Now that control information structures are not shared between control
instances, embed a uvc_control_info instance inside the uvc_control
structure instead of storing a pointer.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index 39e9e36e883..7d67d95de83 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -236,14 +236,15 @@ struct uvc_control_mapping {
 
 struct uvc_control {
         struct uvc_entity *entity;
-        struct uvc_control_info *info;
+        struct uvc_control_info info;
 
         __u8 index;     /* Used to match the uvc_control entry with a
                            uvc_control_info. */
-        __u8 dirty : 1,
-             loaded : 1,
-             modified : 1,
-             cached : 1;
+        __u8 dirty:1,
+             loaded:1,
+             modified:1,
+             cached:1,
+             initialized:1;
 
         __u8 *uvc_data;
 };