6 files changed, 34 insertions, 34 deletions

diff --git a/Documentation/DocBook/media/v4l/media-types.xml b/Documentation/DocBook/media/v4l/media-types.xml
index 1af384250910..0ee0f3386cdf 100644
--- a/Documentation/DocBook/media/v4l/media-types.xml
+++ b/Documentation/DocBook/media/v4l/media-types.xml
@@ -57,10 +57,6 @@
             <entry>Connector for a RGB composite signal.</entry>
           </row>
           <row>
-            <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>
-            <entry>Connector for a test generator.</entry>
-          </row>
-          <row>
             <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>
             <entry>Camera video sensor entity.</entry>
           </row>
diff --git a/drivers/media/i2c/adp1653.c b/drivers/media/i2c/adp1653.c
index 7e9cbf757e95..fb7ed730d932 100644
--- a/drivers/media/i2c/adp1653.c
+++ b/drivers/media/i2c/adp1653.c
@@ -497,7 +497,7 @@ static int adp1653_probe(struct i2c_client *client,
                 if (!client->dev.platform_data) {
                         dev_err(&client->dev,
                                 "Neither DT not platform data provided\n");
-                        return EINVAL;
+                        return -EINVAL;
                 }
                 flash->platform_data = client->dev.platform_data;
         }
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index f8dd7505b529..e1719ffdfb3d 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -1960,10 +1960,9 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled)
         }
 
         /* tx 5v detect */
-        tx_5v = io_read(sd, 0x70) & info->cable_det_mask;
+        tx_5v = irq_reg_0x70 & info->cable_det_mask;
         if (tx_5v) {
                 v4l2_dbg(1, debug, sd, "%s: tx_5v: 0x%x\n", __func__, tx_5v);
-                io_write(sd, 0x71, tx_5v);
                 adv76xx_s_detect_tx_5v_ctrl(sd);
                 if (handled)
                         *handled = true;
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index 8c54fd21022e..a13625722848 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -1843,8 +1843,7 @@ static void au0828_analog_create_entities(struct au0828_dev *dev)
                         ent->function = MEDIA_ENT_F_CONN_RF;
                         break;
                 default: /* AU0828_VMUX_DEBUG */
-                        ent->function = MEDIA_ENT_F_CONN_TEST;
-                        break;
+                        continue;
                 }
 
                 ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]);
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 3ec7e65a3ffa..db49af90217e 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -147,7 +147,7 @@ static int vpfe_prepare_pipeline(struct vpfe_video_device *video)
         mutex_lock(&mdev->graph_mutex);
         ret = media_entity_graph_walk_init(&graph, entity->graph_obj.mdev);
         if (ret) {
-                mutex_unlock(&video->lock);
+                mutex_unlock(&mdev->graph_mutex);
                 return -ENOMEM;
         }
         media_entity_graph_walk_start(&graph, entity);
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 1e3c8cb43bd7..625b38f65764 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -66,27 +66,33 @@ struct media_device_info {
 /*
  * DVB entities
  */
-#define MEDIA_ENT_F_DTV_DEMOD           (MEDIA_ENT_F_BASE + 1)
-#define MEDIA_ENT_F_TS_DEMUX            (MEDIA_ENT_F_BASE + 2)
-#define MEDIA_ENT_F_DTV_CA              (MEDIA_ENT_F_BASE + 3)
-#define MEDIA_ENT_F_DTV_NET_DECAP       (MEDIA_ENT_F_BASE + 4)
+#define MEDIA_ENT_F_DTV_DEMOD           (MEDIA_ENT_F_BASE + 0x00001)
+#define MEDIA_ENT_F_TS_DEMUX            (MEDIA_ENT_F_BASE + 0x00002)
+#define MEDIA_ENT_F_DTV_CA              (MEDIA_ENT_F_BASE + 0x00003)
+#define MEDIA_ENT_F_DTV_NET_DECAP       (MEDIA_ENT_F_BASE + 0x00004)
 
 /*
- * Connectors
+ * I/O entities
  */
-/* It is a responsibility of the entity drivers to add connectors and links */
-#define MEDIA_ENT_F_CONN_RF             (MEDIA_ENT_F_BASE + 21)
-#define MEDIA_ENT_F_CONN_SVIDEO         (MEDIA_ENT_F_BASE + 22)
-#define MEDIA_ENT_F_CONN_COMPOSITE      (MEDIA_ENT_F_BASE + 23)
-/* For internal test signal generators and other debug connectors */
-#define MEDIA_ENT_F_CONN_TEST           (MEDIA_ENT_F_BASE + 24)
+#define MEDIA_ENT_F_IO_DTV              (MEDIA_ENT_F_BASE + 0x01001)
+#define MEDIA_ENT_F_IO_VBI              (MEDIA_ENT_F_BASE + 0x01002)
+#define MEDIA_ENT_F_IO_SWRADIO          (MEDIA_ENT_F_BASE + 0x01003)
 
 /*
- * I/O entities
+ * Connectors
  */
-#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)
+/* It is a responsibility of the entity drivers to add connectors and links */
+#ifdef __KERNEL__
+        /*
+         * For now, it should not be used in userspace, as some
+         * definitions may change
+         */
+
+#define MEDIA_ENT_F_CONN_RF             (MEDIA_ENT_F_BASE + 0x30001)
+#define MEDIA_ENT_F_CONN_SVIDEO         (MEDIA_ENT_F_BASE + 0x30002)
+#define MEDIA_ENT_F_CONN_COMPOSITE      (MEDIA_ENT_F_BASE + 0x30003)
+
+#endif
 
 /*
  * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
@@ -291,14 +297,14 @@ struct media_v2_entity {
         __u32 id;
         char name[64];          /* FIXME: move to a property? (RFC says so) */
         __u32 function;         /* Main function of the entity */
-        __u16 reserved[12];
-};
+        __u32 reserved[6];
+} __attribute__ ((packed));
 
 /* Should match the specific fields at media_intf_devnode */
 struct media_v2_intf_devnode {
         __u32 major;
         __u32 minor;
-};
+} __attribute__ ((packed));
 
 struct media_v2_interface {
         __u32 id;
@@ -310,22 +316,22 @@ struct media_v2_interface {
                 struct media_v2_intf_devnode devnode;
                 __u32 raw[16];
         };
-};
+} __attribute__ ((packed));
 
 struct media_v2_pad {
         __u32 id;
         __u32 entity_id;
         __u32 flags;
-        __u16 reserved[9];
-};
+        __u32 reserved[5];
+} __attribute__ ((packed));
 
 struct media_v2_link {
         __u32 id;
         __u32 source_id;
         __u32 sink_id;
         __u32 flags;
-        __u32 reserved[5];
-};
+        __u32 reserved[6];
+} __attribute__ ((packed));
 
 struct media_v2_topology {
         __u64 topology_version;
@@ -345,7 +351,7 @@ struct media_v2_topology {
         __u32 num_links;
         __u32 reserved4;
         __u64 ptr_links;
-};
+} __attribute__ ((packed));
 
 static inline void __user *media_get_uptr(__u64 arg)
 {