History

Merge tag 'media/v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab: - Documentation for digital TV (both kAPI and uAPI) are now in sync with the implementation (except for legacy/deprecated ioctls). This is a major step, as there were always a gap there - New sensor driver: imx274 - New cec driver: cec-gpio - New platform driver for rockship rga and tegra CEC - New RC driver: tango-ir - Several cleanups at atomisp driver - Core improvements for RC, CEC, V4L2 async probing support and DVB - Lots of drivers cleanup, fixes and improvements. * tag 'media/v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (332 commits) dvb_frontend: don't use-after-free the frontend struct media: dib0700: fix invalid dvb_detach argument media: v4l2-ctrls: Don't validate BITMASK twice media: s5p-mfc: fix lockdep warning media: dvb-core: always call invoke_release() in fe_free() media: usb: dvb-usb-v2: dvb_usb_core: remove redundant code in dvb_usb_fe_sleep media: au0828: make const array addr_list static media: cx88: make const arrays default_addr_list and pvr2000_addr_list static media: drxd: make const array fastIncrDecLUT static media: usb: fix spelling mistake: "synchronuously" -> "synchronously" media: ddbridge: fix build warnings media: av7110: avoid 2038 overflow in debug print media: Don't do DMA on stack for firmware upload in the AS102 driver media: v4l: async: fix unregister for implicitly registered sub-device notifiers media: v4l: async: fix return of unitialized variable ret media: imx274: fix missing return assignment from call to imx274_mode_regs media: camss-vfe: always initialize reg at vfe_set_xbar_cfg() media: atomisp: make function calls cleaner media: atomisp: get rid of storage_class.h media: atomisp: get rid of wrong stddef.h include ...

Linus Torvalds committed 8 years ago

Commit 5d352e62 parents 93ea0eb f2ecc3d498 files · +12046 −22609Browse files

Showing the changes to include/uapi/linux (2 of 498 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/cec.h +2 −0
  2. include/uapi/linux/dvb/frontend.h +1 −1
include/uapi/linux/cec.h+2−0
@@ -411,6 +411,8 @@ struct cec_log_addrs { · 410 unmodified lines
411411 #define CEC_EVENT_LOST_MSGS 2
412412 #define CEC_EVENT_PIN_CEC_LOW 3
413413 #define CEC_EVENT_PIN_CEC_HIGH 4
414+#define CEC_EVENT_PIN_HPD_LOW 5
415+#define CEC_EVENT_PIN_HPD_HIGH 6
414416
415417 #define CEC_EVENT_FL_INITIAL_STATE (1 << 0)
416418 #define CEC_EVENT_FL_DROPPED_EVENTS (1 << 1)
include/uapi/linux/dvb/frontend.h+1−1
@@ -831,7 +831,7 @@ struct dtv_fe_stats { · 830 unmodified lines
831831 * @cmd: Digital TV command.
832832 * @reserved: Not used.
833833 * @u: Union with the values for the command.
834− * @result: Result of the command set (currently unused).
834+ * @result: Unused
835835 *
836836 * The @u union may have either one of the values below:
837837 *