Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (184 commits)
  V4L/DVB (5563): Radio-maestro.c Replace radio_ioctl to use video_ioctl2
  V4L/DVB (5562): Radio-gemtek-pci.c Replace gemtek_pci_ioctl to use video_ioctl2
  V4L/DVB (5560): Ivtv: fix incorrect bitwise-and for command flags.
  V4L/DVB (5558): Opera: use 7-bit i2c addresses
  V4L/DVB (5557): Cafe_ccic: check return value of pci_enable_device
  V4L/DVB (5556): Radio-gemtek.c Replace gemtek_ioctl to use video_ioctl2
  V4L/DVB (5555): Radio-aimslab.c Replace rt_ioctl to use video_ioctl2
  V4L/DVB (5554): Fix: vidioc_g_parm were not zeroing the memory
  V4L/DVB (5553): Replace typhoon_do_ioctl to use video_ioctl2
  V4L/DVB (5552): Plan-b: Switch to refcounting PCI API
  V4L/DVB (5551): Plan-b: header change
  V4L/DVB (5550): Radio-sf16fmi.c Replace fmi_do_ioctl to use video_ioctl2
  V4L/DVB (5549): Radio-sf16fmr2.c Replace fmr2_do_ioctl to use video_ioctl2
  V4L/DVB (5548): Fix v4l2 buffer to the length
  V4L/DVB (5547): Add ENUM_FRAMESIZES and ENUM_FRAMEINTERVALS ioctls
  V4L/DVB (5546): Radio-terratec.c Replace tt_do_ioctl to use video_ioctl2
  V4L/DVB (5545): Saa7146: Release capture buffers on device close
  V4L/DVB (5544): Budget-av: Make inversion setting configurable, add KNC ONE V1.0 card
  V4L/DVB (5543): Tda10023: Add support for frontend TDA10023
  V4L/DVB (5542): Budget-av: Remove polarity switching of the clock for DVB-C
  ...

1 files changed, 59 insertions, 1 deletions

diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index d5e6bc850643..32fbe1ae6251 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -1168,7 +1168,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                         buf->sequence = 0;
                         buf->memory = V4L2_MEMORY_MMAP;
                         buf->m.offset = pdev->fill_image * pdev->len_per_image;
-                        buf->length = buf->bytesused;
+                        buf->length = pdev->len_per_image;
                         pwc_next_image(pdev);
 
                         PWC_DEBUG_IOCTL("VIDIOC_DQBUF: buf->index=%d\n",buf->index);
@@ -1193,6 +1193,64 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                         return 0;
                 }
 
+                case VIDIOC_ENUM_FRAMESIZES:
+                {
+                        struct v4l2_frmsizeenum *fsize = arg;
+                        unsigned int i = 0, index = fsize->index;
+
+                        if (fsize->pixel_format == V4L2_PIX_FMT_YUV420) {
+                                for (i = 0; i < PSZ_MAX; i++) {
+                                        if (pdev->image_mask & (1UL << i)) {
+                                                if (!index--) {
+                                                        fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
+                                                        fsize->discrete.width = pwc_image_sizes[i].x;
+                                                        fsize->discrete.height = pwc_image_sizes[i].y;
+                                                        return 0;
+                                                }
+                                        }
+                                }
+                        } else if (fsize->index == 0 &&
+                                   ((fsize->pixel_format == V4L2_PIX_FMT_PWC1 && DEVICE_USE_CODEC1(pdev->type)) ||
+                                    (fsize->pixel_format == V4L2_PIX_FMT_PWC2 && DEVICE_USE_CODEC23(pdev->type)))) {
+
+                                fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
+                                fsize->discrete.width = pdev->abs_max.x;
+                                fsize->discrete.height = pdev->abs_max.y;
+                                return 0;
+                        }
+                        return -EINVAL;
+                }
+
+                case VIDIOC_ENUM_FRAMEINTERVALS:
+                {
+                        struct v4l2_frmivalenum *fival = arg;
+                        int size = -1;
+                        unsigned int i;
+
+                        for (i = 0; i < PSZ_MAX; i++) {
+                                if (pwc_image_sizes[i].x == fival->width &&
+                                    pwc_image_sizes[i].y == fival->height) {
+                                        size = i;
+                                        break;
+                                }
+                        }
+
+                        /* TODO: Support raw format */
+                        if (size < 0 || fival->pixel_format != V4L2_PIX_FMT_YUV420) {
+                                return -EINVAL;
+                        }
+
+                        i = pwc_get_fps(pdev, fival->index, size);
+                        if (!i)
+                                return -EINVAL;
+
+                        fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;
+                        fival->discrete.numerator = 1;
+                        fival->discrete.denominator = i;
+
+                        return 0;
+                }
+
                 default:
                         return pwc_ioctl(pdev, cmd, arg);
         } /* ..switch */