Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (313 commits)
  V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
  V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
  V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
  V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
  V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
  V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
  V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
  V4L/DVB (9179): S2API: frontend.h cleanup
  V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
  V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
  V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
  V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
  V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
  V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
  V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
  V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
  V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
  V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
  V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
  V4L/DVB: v4l2-dev: remove duplicated #include
  ...

1 files changed, 42 insertions, 21 deletions

diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 68c268981861..02bb6747a39c 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -628,6 +628,9 @@ void saa7134_set_tvnorm_hw(struct saa7134_dev *dev)
 
         if (card_in(dev, dev->ctl_input).tv)
                 saa7134_i2c_call_clients(dev, VIDIOC_S_STD, &dev->tvnorm->id);
+        /* Set the correct norm for the saa6752hs. This function
+           does nothing if there is no saa6752hs. */
+        saa7134_i2c_call_saa6752(dev, VIDIOC_S_STD, &dev->tvnorm->id);
 }
 
 static void set_h_prescale(struct saa7134_dev *dev, int task, int prescale)
@@ -1330,6 +1333,8 @@ static int video_open(struct inode *inode, struct file *file)
         struct saa7134_fh *fh;
         enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         int radio = 0;
+
+        lock_kernel();
         list_for_each_entry(dev, &saa7134_devlist, devlist) {
                 if (dev->video_dev && (dev->video_dev->minor == minor))
                         goto found;
@@ -1342,6 +1347,7 @@ static int video_open(struct inode *inode, struct file *file)
                         goto found;
                 }
         }
+        unlock_kernel();
         return -ENODEV;
  found:
 
@@ -1350,8 +1356,10 @@ static int video_open(struct inode *inode, struct file *file)
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -1384,6 +1392,7 @@ static int video_open(struct inode *inode, struct file *file)
                 /* switch to video/vbi mode */
                 video_mux(dev,dev->ctl_input);
         }
+        unlock_kernel();
         return 0;
 }
 
@@ -1790,18 +1799,25 @@ static int saa7134_querycap(struct file *file, void  *priv,
                 return 0;
 }
 
-static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
+int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id *id)
 {
-        struct saa7134_fh *fh = priv;
-        struct saa7134_dev *dev = fh->dev;
         unsigned long flags;
         unsigned int i;
         v4l2_std_id fixup;
         int err;
 
-        err = v4l2_prio_check(&dev->prio, &fh->prio);
-        if (0 != err)
-                return err;
+        /* When called from the empress code fh == NULL.
+           That needs to be fixed somehow, but for now this is
+           good enough. */
+        if (fh) {
+                err = v4l2_prio_check(&dev->prio, &fh->prio);
+                if (0 != err)
+                        return err;
+        } else if (res_locked(dev, RESOURCE_OVERLAY)) {
+                /* Don't change the std from the mpeg device
+                   if overlay is active. */
+                return -EBUSY;
+        }
 
         for (i = 0; i < TVNORMS; i++)
                 if (*id == tvnorms[i].id)
@@ -1834,7 +1850,7 @@ static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
         *id = tvnorms[i].id;
 
         mutex_lock(&dev->lock);
-        if (res_check(fh, RESOURCE_OVERLAY)) {
+        if (fh && res_check(fh, RESOURCE_OVERLAY)) {
                 spin_lock_irqsave(&dev->slock, flags);
                 stop_preview(dev, fh);
                 spin_unlock_irqrestore(&dev->slock, flags);
@@ -1851,6 +1867,23 @@ static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
         mutex_unlock(&dev->lock);
         return 0;
 }
+EXPORT_SYMBOL_GPL(saa7134_s_std_internal);
+
+static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct saa7134_fh *fh = priv;
+
+        return saa7134_s_std_internal(fh->dev, fh, id);
+}
+
+static int saa7134_g_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct saa7134_fh *fh = priv;
+        struct saa7134_dev *dev = fh->dev;
+
+        *id = dev->tvnorm->id;
+        return 0;
+}
 
 static int saa7134_cropcap(struct file *file, void *priv,
                                         struct v4l2_cropcap *cap)
@@ -2077,18 +2110,6 @@ static int saa7134_enum_fmt_vid_overlay(struct file *file, void  *priv,
         return 0;
 }
 
-static int saa7134_enum_fmt_vbi_cap(struct file *file, void  *priv,
-                                        struct v4l2_fmtdesc *f)
-{
-        if (0 != f->index)
-                return -EINVAL;
-
-        f->pixelformat = V4L2_PIX_FMT_GREY;
-        strcpy(f->description, "vbi data");
-
-        return 0;
-}
-
 static int saa7134_g_fbuf(struct file *file, void *f,
                                 struct v4l2_framebuffer *fb)
 {
@@ -2379,7 +2400,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_g_fmt_vid_overlay       = saa7134_g_fmt_vid_overlay,
         .vidioc_try_fmt_vid_overlay     = saa7134_try_fmt_vid_overlay,
         .vidioc_s_fmt_vid_overlay       = saa7134_s_fmt_vid_overlay,
-        .vidioc_enum_fmt_vbi_cap        = saa7134_enum_fmt_vbi_cap,
         .vidioc_g_fmt_vbi_cap           = saa7134_try_get_set_fmt_vbi_cap,
         .vidioc_try_fmt_vbi_cap         = saa7134_try_get_set_fmt_vbi_cap,
         .vidioc_s_fmt_vbi_cap           = saa7134_try_get_set_fmt_vbi_cap,
@@ -2391,6 +2411,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_qbuf                    = saa7134_qbuf,
         .vidioc_dqbuf                   = saa7134_dqbuf,
         .vidioc_s_std                   = saa7134_s_std,
+        .vidioc_g_std                   = saa7134_g_std,
         .vidioc_enum_input              = saa7134_enum_input,
         .vidioc_g_input                 = saa7134_g_input,
         .vidioc_s_input                 = saa7134_s_input,