Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2cddf99 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c66af411

drivers/media/video/v4l2-ioctl.c

+6 −2
Original line number Diff line number Diff line
@@ -1831,7 +1831,9 @@ struct v4l2_ioctl_info { 
		.ioctl = _ioctl,					\

		.flags = _flags | INFO_FL_STD,				\

		.name = #_ioctl,					\

		{							\

			.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,					\

		},							\

		.debug = _debug,					\

	}