Merge branch 'fixes' into patchwork

Some macros were changed/removed at the material for v4.5. We need
to sync with those changes here, in order to avoid troubles.

* v4l_for_linus:
  [media] media.h: get rid of MEDIA_ENT_F_CONN_TEST
  [media] [for,v4.5] media.h: increase the spacing between function ranges
  [media] media: i2c/adp1653: probe: fix erroneous return value
  [media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline()

diff --cc include/uapi/linux/media.h
index 7113b1a8cb4e6b0c67828ce5a6ccc57c3fe9e873,f0328524be6e461704e00dc162c4a5425ea787ea..6aac2f035a5d225f23086ef6a35bf46f25ed0fbb
--- 1/include/uapi/linux/media.h
--- 2/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@@ -74,26 -74,17 +74,26 @@@ struct media_device_info 
  /*
   * I/O entities
   */
- #define MEDIA_ENT_F_IO_DTV            (MEDIA_ENT_F_BASE + 31)
- #define MEDIA_ENT_F_IO_VBI            (MEDIA_ENT_F_BASE + 32)
- #define MEDIA_ENT_F_IO_SWRADIO                (MEDIA_ENT_F_BASE + 33)
+ #define MEDIA_ENT_F_IO_DTV            (MEDIA_ENT_F_BASE + 1001)
+ #define MEDIA_ENT_F_IO_VBI            (MEDIA_ENT_F_BASE + 1002)
+ #define MEDIA_ENT_F_IO_SWRADIO                (MEDIA_ENT_F_BASE + 1003)
  
- #define MEDIA_ENT_F_IF_VID_DECODER    (MEDIA_ENT_F_BASE + 41)
- #define MEDIA_ENT_F_IF_AUD_DECODER    (MEDIA_ENT_F_BASE + 42)
 +/*
 + * Analog TV IF-PLL decoders
 + *
 + * It is a responsibility of the master/bridge drivers to create links
 + * for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.
 + */
++#define MEDIA_ENT_F_IF_VID_DECODER    (MEDIA_ENT_F_BASE + 2001)
++#define MEDIA_ENT_F_IF_AUD_DECODER    (MEDIA_ENT_F_BASE + 2002)
++
+ /*
+  * Connectors
+  */
+ /* It is a responsibility of the entity drivers to add connectors and links */
+ #define MEDIA_ENT_F_CONN_RF           (MEDIA_ENT_F_BASE + 10001)
+ #define MEDIA_ENT_F_CONN_SVIDEO               (MEDIA_ENT_F_BASE + 10002)
+ #define MEDIA_ENT_F_CONN_COMPOSITE    (MEDIA_ENT_F_BASE + 10003)
  
  /*
   * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and