History

Merge tag 'media/v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab: "A series of driver fixes: - a few compilation fixes with randconfigs - one potential compilation breakage on userspace due to the usage of a gcc extension - several warnings fixed - some other random driver fixes" * tag 'media/v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (22 commits) [media] s5p-jpeg: Avoid -Wuninitialized warning in s5p_jpeg_parse_hdr [media] s5p-fimc: Only build suspend/resume for PM [media] s5p-jpeg: Only build suspend/resume for PM [media] Remove references to non-existent PLAT_S5P symbol [media] videobuf-dma-contig: set vm_pgoff to be zero to pass the sanity check in vm_iomap_memory() [media] tw68: remove bogus I2C_ALGOBIT dependency [media] usbvision-video: two use after frees [media] tw68: remove deprecated IRQF_DISABLED [media] xc5000: use after free in release() [media] em28xx-input: NULL dereference on error [media] wl128x: fix fmdbg compiler warning Revert "[media] v4l2-dv-timings: fix a sparse warning" [media] hackrf: harmless off by one in debug code [media] cx23885: initialize config structs for T9580 [media] v4l: uvcvideo: Fix buffer completion size check [media] vivid: fix buffer overrun [media] saa7146: Create a device name before it's used [media] em28xx: fix uninitialized variable warning [media] vivid: fix Kconfig FB dependency [media] anysee: make sure loading modules is const ...

Linus Torvalds committed 12 years ago

Commit f7e87a42 parents ebbe914 f3d83a125 files · +62 −27Browse files

Showing the changes to include/uapi/linux (1 of 25 files). Show all

Unified · Split

include/uapi/linux/v4l2-dv-timings.h+9−0
@@ -21,8 +21,17 @@ · 20 unmodified lines
2121 #ifndef _V4L2_DV_TIMINGS_H
2222 #define _V4L2_DV_TIMINGS_H
2323
24+#if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6))
25+/* Sadly gcc versions older than 4.6 have a bug in how they initialize
26+ anonymous unions where they require additional curly brackets.
27+ This violates the C1x standard. This workaround adds the curly brackets
28+ if needed. */
2429 #define V4L2_INIT_BT_TIMINGS(_width, args...) \
2530 { .bt = { _width , ## args } }
31+#else
32+#define V4L2_INIT_BT_TIMINGS(_width, args...) \
33+ .bt = { _width , ## args }
34+#endif
2635
2736 /* CEA-861-E timings (i.e. standard HDTV timings) */
2837