8 files changed, 54 insertions, 27 deletions

diff --git a/drivers/media/common/cx2341x.c b/drivers/media/common/cx2341x.c
index 103ef6bad2e2..be763150b8aa 100644
--- a/drivers/media/common/cx2341x.c
+++ b/drivers/media/common/cx2341x.c
@@ -1490,6 +1490,7 @@ static struct v4l2_ctrl *cx2341x_ctrl_new_custom(struct v4l2_ctrl_handler *hdl,
 {
         struct v4l2_ctrl_config cfg;
 
+        memset(&cfg, 0, sizeof(cfg));
         cx2341x_ctrl_fill(id, &cfg.name, &cfg.type, &min, &max, &step, &def, &cfg.flags);
         cfg.ops = &cx2341x_ops;
         cfg.id = id;
diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
index 72fb5838cae0..7975c6608e20 100644
--- a/drivers/media/dvb-frontends/cx24123.c
+++ b/drivers/media/dvb-frontends/cx24123.c
@@ -1095,6 +1095,7 @@ struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,
                 sizeof(state->tuner_i2c_adapter.name));
         state->tuner_i2c_adapter.algo      = &cx24123_tuner_i2c_algo;
         state->tuner_i2c_adapter.algo_data = NULL;
+        state->tuner_i2c_adapter.dev.parent = i2c->dev.parent;
         i2c_set_adapdata(&state->tuner_i2c_adapter, state);
         if (i2c_add_adapter(&state->tuner_i2c_adapter) < 0) {
                 err("tuner i2c bus could not be initialized\n");
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index d4fa213ba74a..de88b980a837 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -2325,7 +2325,7 @@ static int adv7604_log_status(struct v4l2_subdev *sd)
         v4l2_info(sd, "HDCP keys read: %s%s\n",
                         (hdmi_read(sd, 0x04) & 0x20) ? "yes" : "no",
                         (hdmi_read(sd, 0x04) & 0x10) ? "ERROR" : "");
-        if (!is_hdmi(sd)) {
+        if (is_hdmi(sd)) {
                 bool audio_pll_locked = hdmi_read(sd, 0x04) & 0x01;
                 bool audio_sample_packet_detect = hdmi_read(sd, 0x18) & 0x01;
                 bool audio_mute = io_read(sd, 0x65) & 0x40;
diff --git a/drivers/media/radio/radio-miropcm20.c b/drivers/media/radio/radio-miropcm20.c
index 998919e97dfe..7b35e633118d 100644
--- a/drivers/media/radio/radio-miropcm20.c
+++ b/drivers/media/radio/radio-miropcm20.c
@@ -27,6 +27,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/videodev2.h>
 #include <linux/kthread.h>
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 90dec2955f1c..29abc379551e 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1342,7 +1342,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
         struct em28xx *dev = video_drvdata(file);
         struct em28xx_v4l2 *v4l2 = dev->v4l2;
 
-        if (v4l2->streaming_users > 0)
+        if (vb2_is_busy(&v4l2->vb_vidq))
                 return -EBUSY;
 
         vidioc_try_fmt_vid_cap(file, priv, f);
@@ -1883,8 +1883,9 @@ static int em28xx_v4l2_open(struct file *filp)
                 return -EINVAL;
         }
 
-        em28xx_videodbg("open dev=%s type=%s\n",
-                        video_device_node_name(vdev), v4l2_type_names[fh_type]);
+        em28xx_videodbg("open dev=%s type=%s users=%d\n",
+                        video_device_node_name(vdev), v4l2_type_names[fh_type],
+                        v4l2->users);
 
         if (mutex_lock_interruptible(&dev->lock))
                 return -ERESTARTSYS;
@@ -1897,9 +1898,7 @@ static int em28xx_v4l2_open(struct file *filp)
                 return ret;
         }
 
-        if (v4l2_fh_is_singular_file(filp)) {
-                em28xx_videodbg("first opened filehandle, initializing device\n");
-
+        if (v4l2->users == 0) {
                 em28xx_set_mode(dev, EM28XX_ANALOG_MODE);
 
                 if (vdev->vfl_type != VFL_TYPE_RADIO)
@@ -1910,8 +1909,6 @@ static int em28xx_v4l2_open(struct file *filp)
                  * of some i2c devices
                  */
                 em28xx_wake_i2c(dev);
-        } else {
-                em28xx_videodbg("further filehandles are already opened\n");
         }
 
         if (vdev->vfl_type == VFL_TYPE_RADIO) {
@@ -1921,6 +1918,7 @@ static int em28xx_v4l2_open(struct file *filp)
 
         kref_get(&dev->ref);
         kref_get(&v4l2->ref);
+        v4l2->users++;
 
         mutex_unlock(&dev->lock);
 
@@ -2027,11 +2025,12 @@ static int em28xx_v4l2_close(struct file *filp)
         struct em28xx_v4l2    *v4l2 = dev->v4l2;
         int              errCode;
 
-        mutex_lock(&dev->lock);
+        em28xx_videodbg("users=%d\n", v4l2->users);
 
-        if (v4l2_fh_is_singular_file(filp)) {
-                em28xx_videodbg("last opened filehandle, shutting down device\n");
+        vb2_fop_release(filp);
+        mutex_lock(&dev->lock);
 
+        if (v4l2->users == 1) {
                 /* No sense to try to write to the device */
                 if (dev->disconnected)
                         goto exit;
@@ -2050,12 +2049,10 @@ static int em28xx_v4l2_close(struct file *filp)
                         em28xx_errdev("cannot change alternate number to "
                                         "0 (error=%i)\n", errCode);
                 }
-        } else {
-                em28xx_videodbg("further opened filehandles left\n");
         }
 
 exit:
-        vb2_fop_release(filp);
+        v4l2->users--;
         kref_put(&v4l2->ref, em28xx_free_v4l2);
         mutex_unlock(&dev->lock);
         kref_put(&dev->ref, em28xx_free_device);
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 84ef8efdb148..4360338e7b31 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -524,6 +524,7 @@ struct em28xx_v4l2 {
         int sensor_yres;
         int sensor_xtal;
 
+        int users;              /* user count for exclusive use */
         int streaming_users;    /* number of actively streaming users */
 
         u32 frequency;          /* selected tuner frequency */
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index c359006074a8..25d3ae2188cb 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -971,6 +971,7 @@ static int __reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
          * to the userspace.
          */
         req->count = allocated_buffers;
+        q->waiting_for_buffers = !V4L2_TYPE_IS_OUTPUT(q->type);
 
         return 0;
 }
@@ -1018,6 +1019,7 @@ static int __create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create
                 memset(q->plane_sizes, 0, sizeof(q->plane_sizes));
                 memset(q->alloc_ctx, 0, sizeof(q->alloc_ctx));
                 q->memory = create->memory;
+                q->waiting_for_buffers = !V4L2_TYPE_IS_OUTPUT(q->type);
         }
 
         num_buffers = min(create->count, VIDEO_MAX_FRAME - q->num_buffers);
@@ -1130,7 +1132,7 @@ EXPORT_SYMBOL_GPL(vb2_plane_vaddr);
  */
 void *vb2_plane_cookie(struct vb2_buffer *vb, unsigned int plane_no)
 {
-        if (plane_no > vb->num_planes || !vb->planes[plane_no].mem_priv)
+        if (plane_no >= vb->num_planes || !vb->planes[plane_no].mem_priv)
                 return NULL;
 
         return call_ptr_memop(vb, cookie, vb->planes[plane_no].mem_priv);
@@ -1165,13 +1167,10 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
         if (WARN_ON(vb->state != VB2_BUF_STATE_ACTIVE))
                 return;
 
-        if (!q->start_streaming_called) {
-                if (WARN_ON(state != VB2_BUF_STATE_QUEUED))
-                        state = VB2_BUF_STATE_QUEUED;
-        } else if (WARN_ON(state != VB2_BUF_STATE_DONE &&
-                           state != VB2_BUF_STATE_ERROR)) {
-                        state = VB2_BUF_STATE_ERROR;
-        }
+        if (WARN_ON(state != VB2_BUF_STATE_DONE &&
+                    state != VB2_BUF_STATE_ERROR &&
+                    state != VB2_BUF_STATE_QUEUED))
+                state = VB2_BUF_STATE_ERROR;
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         /*
@@ -1762,6 +1761,12 @@ static int vb2_start_streaming(struct vb2_queue *q)
         q->start_streaming_called = 0;
 
         dprintk(1, "driver refused to start streaming\n");
+        /*
+         * If you see this warning, then the driver isn't cleaning up properly
+         * after a failed start_streaming(). See the start_streaming()
+         * documentation in videobuf2-core.h for more information how buffers
+         * should be returned to vb2 in start_streaming().
+         */
         if (WARN_ON(atomic_read(&q->owned_by_drv_count))) {
                 unsigned i;
 
@@ -1777,6 +1782,12 @@ static int vb2_start_streaming(struct vb2_queue *q)
                 /* Must be zero now */
                 WARN_ON(atomic_read(&q->owned_by_drv_count));
         }
+        /*
+         * If done_list is not empty, then start_streaming() didn't call
+         * vb2_buffer_done(vb, VB2_BUF_STATE_QUEUED) but STATE_ERROR or
+         * STATE_DONE.
+         */
+        WARN_ON(!list_empty(&q->done_list));
         return ret;
 }
 
@@ -1812,6 +1823,7 @@ static int vb2_internal_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
          */
         list_add_tail(&vb->queued_entry, &q->queued_list);
         q->queued_count++;
+        q->waiting_for_buffers = false;
         vb->state = VB2_BUF_STATE_QUEUED;
         if (V4L2_TYPE_IS_OUTPUT(q->type)) {
                 /*
@@ -2123,6 +2135,12 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
         if (q->start_streaming_called)
                 call_void_qop(q, stop_streaming, q);
 
+        /*
+         * If you see this warning, then the driver isn't cleaning up properly
+         * in stop_streaming(). See the stop_streaming() documentation in
+         * videobuf2-core.h for more information how buffers should be returned
+         * to vb2 in stop_streaming().
+         */
         if (WARN_ON(atomic_read(&q->owned_by_drv_count))) {
                 for (i = 0; i < q->num_buffers; ++i)
                         if (q->bufs[i]->state == VB2_BUF_STATE_ACTIVE)
@@ -2272,6 +2290,7 @@ static int vb2_internal_streamoff(struct vb2_queue *q, enum v4l2_buf_type type)
          * their normal dequeued state.
          */
         __vb2_queue_cancel(q);
+        q->waiting_for_buffers = !V4L2_TYPE_IS_OUTPUT(q->type);
 
         dprintk(3, "successful\n");
         return 0;
@@ -2590,10 +2609,17 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait)
         }
 
         /*
-         * There is nothing to wait for if no buffer has been queued and the
-         * queue isn't streaming, or if the error flag is set.
+         * There is nothing to wait for if the queue isn't streaming, or if the
+         * error flag is set.
+         */
+        if (!vb2_is_streaming(q) || q->error)
+                return res | POLLERR;
+        /*
+         * For compatibility with vb1: if QBUF hasn't been called yet, then
+         * return POLLERR as well. This only affects capture queues, output
+         * queues will always initialize waiting_for_buffers to false.
          */
-        if ((list_empty(&q->queued_list) && !vb2_is_streaming(q)) || q->error)
+        if (q->waiting_for_buffers)
                 return res | POLLERR;
 
         /*
diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
index adefc31bb853..9b163a440f89 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
@@ -113,7 +113,7 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_fla
                 goto fail_pages_alloc;
 
         ret = sg_alloc_table_from_pages(&buf->sg_table, buf->pages,
-                        buf->num_pages, 0, size, gfp_flags);
+                        buf->num_pages, 0, size, GFP_KERNEL);
         if (ret)
                 goto fail_table_alloc;