From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 31 Jul 2012 23:41:34 +0000 (-0700)
Subject: drivers/media/video/v4l2-ioctl.c: fix build
X-Git-Tag: MMI-PSA29.97-13-9~16201^2~117
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c2cddf991974a00aa7b40a21e829bc034b8199b6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

drivers/media/video/v4l2-ioctl.c: fix build

Fix zillions of these:

drivers/media/video/v4l2-ioctl.c:1848: error: unknown field 'func' specified in initializer
drivers/media/video/v4l2-ioctl.c:1848: warning: missing braces around initializer
drivers/media/video/v4l2-ioctl.c:1848: warning: (near initialization for 'v4l2_ioctls[0].<anonymous>')
drivers/media/video/v4l2-ioctl.c:1848: warning: initialization makes integer from pointer without a cast
drivers/media/video/v4l2-ioctl.c:1848: error: initializer element is not computable at load time
drivers/media/video/v4l2-ioctl.c:1848: error: (near initialization for 'v4l2_ioctls[0].<anonymous>.offset')

Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 70e0efb127a6..4b4059d64272 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -1831,7 +1831,9 @@ struct v4l2_ioctl_info {
 		.ioctl = _ioctl,					\
 		.flags = _flags | INFO_FL_STD,				\
 		.name = #_ioctl,					\
-		.offset = offsetof(struct v4l2_ioctl_ops, _vidioc),	\
+		{							\
+			.offset = offsetof(struct v4l2_ioctl_ops, _vidioc),\
+		},							\
 		.debug = _debug,					\
 	}
 
@@ -1840,7 +1842,9 @@ struct v4l2_ioctl_info {
 		.ioctl = _ioctl,					\
 		.flags = _flags | INFO_FL_FUNC,				\
 		.name = #_ioctl,					\
-		.func = _func,						\
+		{							\
+			.func = _func,					\
+		},							\
 		.debug = _debug,					\
 	}