Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  [media] gspca - sonixj: Better handling of the bridge registers 0x01 and 0x17
  [media] gspca - sonixj: Add the bit definitions of the bridge reg 0x01 and 0x17
  [media] gspca - sonixj: Set the flag for some devices
  [media] gspca - sonixj: Add a flag in the driver_info table
  [media] gspca - sonixj: Fix a bad probe exchange
  [media] gspca - sonixj: Move bridge init to sd start
  [media] bttv: remove unneeded locking comments
  [media] bttv: fix mutex use before init (BZ#24602)
  [media] Don't export format_by_forcc on two different drivers

diff --combined drivers/media/video/bt8xx/bttv-driver.c
index a529619e51f687d1386c6c673a0feaa9ba8d517a,e071b62f36aa0c7b61f6857e783189784cf2681b..0902ec041c7a71fd11842b3128de23dbb4ec5daf
--- 1/drivers/media/video/bt8xx/bttv-driver.c
--- 2/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@@ -42,6 -42,7 +42,6 @@@
  #include <linux/fs.h>
  #include <linux/kernel.h>
  #include <linux/sched.h>
 -#include <linux/smp_lock.h>
  #include <linux/interrupt.h>
  #include <linux/kdev_t.h>
  #include "bttvp.h"
@@@ -854,7 -855,6 +854,6 @@@ int check_alloc_btres_lock(struct bttv 
                xbits |= RESOURCE_VIDEO_READ | RESOURCE_VIDEO_STREAM;
  
        /* is it free? */
-       mutex_lock(&btv->lock);
        if (btv->resources & xbits) {
                /* no, someone else uses it */
                goto fail;
@@@ -884,11 -884,9 +883,9 @@@
        /* it's free, grab it */
        fh->resources  |= bit;
        btv->resources |= bit;
-       mutex_unlock(&btv->lock);
        return 1;
  
   fail:
-       mutex_unlock(&btv->lock);
        return 0;
  }
  
@@@ -940,7 -938,6 +937,6 @@@ void free_btres_lock(struct bttv *btv, 
                /* trying to free ressources not allocated by us ... */
                printk("bttv: BUG! (btres)\n");
        }
-       mutex_lock(&btv->lock);
        fh->resources  &= ~bits;
        btv->resources &= ~bits;
  
@@@ -951,8 -948,6 +947,6 @@@
  
        if (0 == (bits & VBI_RESOURCES))
                disclaim_vbi_lines(btv);
- 
-       mutex_unlock(&btv->lock);
  }
  
  /* ----------------------------------------------------------------------- */
@@@ -1713,28 -1708,20 +1707,20 @@@ static int bttv_prepare_buffer(struct v
  
                /* Make sure tvnorm and vbi_end remain consistent
                   until we're done. */
-               mutex_lock(&btv->lock);
  
                norm = btv->tvnorm;
  
                /* In this mode capturing always starts at defrect.top
                   (default VDELAY), ignoring cropping parameters. */
                if (btv->vbi_end > bttv_tvnorms[norm].cropcap.defrect.top) {
-                       mutex_unlock(&btv->lock);
                        return -EINVAL;
                }
  
-               mutex_unlock(&btv->lock);
- 
                c.rect = bttv_tvnorms[norm].cropcap.defrect;
        } else {
-               mutex_lock(&btv->lock);
- 
                norm = btv->tvnorm;
                c = btv->crop[!!fh->do_crop];
  
-               mutex_unlock(&btv->lock);
- 
                if (width < c.min_scaled_width ||
                    width > c.max_scaled_width ||
                    height < c.min_scaled_height)
@@@ -1858,7 -1845,6 +1844,6 @@@ static int bttv_s_std(struct file *file
        unsigned int i;
        int err;
  
-       mutex_lock(&btv->lock);
        err = v4l2_prio_check(&btv->prio, fh->prio);
        if (err)
                goto err;
@@@ -1874,7 -1860,6 +1859,6 @@@
        set_tvnorm(btv, i);
  
  err:
-       mutex_unlock(&btv->lock);
  
        return err;
  }
@@@ -1898,7 -1883,6 +1882,6 @@@ static int bttv_enum_input(struct file 
        struct bttv *btv = fh->btv;
        int rc = 0;
  
-       mutex_lock(&btv->lock);
        if (i->index >= bttv_tvcards[btv->c.type].video_inputs) {
                rc = -EINVAL;
                goto err;
@@@ -1928,7 -1912,6 +1911,6 @@@
        i->std = BTTV_NORMS;
  
  err:
-       mutex_unlock(&btv->lock);
  
        return rc;
  }
@@@ -1938,9 -1921,7 +1920,7 @@@ static int bttv_g_input(struct file *fi
        struct bttv_fh *fh = priv;
        struct bttv *btv = fh->btv;
  
-       mutex_lock(&btv->lock);
        *i = btv->input;
-       mutex_unlock(&btv->lock);
  
        return 0;
  }
@@@ -1952,7 -1933,6 +1932,6 @@@ static int bttv_s_input(struct file *fi
  
        int err;
  
-       mutex_lock(&btv->lock);
        err = v4l2_prio_check(&btv->prio, fh->prio);
        if (unlikely(err))
                goto err;
@@@ -1965,7 -1945,6 +1944,6 @@@
        set_input(btv, i, btv->tvnorm);
  
  err:
-       mutex_unlock(&btv->lock);
        return 0;
  }
  
@@@ -1979,7 -1958,6 +1957,6 @@@ static int bttv_s_tuner(struct file *fi
        if (unlikely(0 != t->index))
                return -EINVAL;
  
-       mutex_lock(&btv->lock);
        if (unlikely(btv->tuner_type == TUNER_ABSENT)) {
                err = -EINVAL;
                goto err;
@@@ -1995,7 -1973,6 +1972,6 @@@
                btv->audio_mode_gpio(btv, t, 1);
  
  err:
-       mutex_unlock(&btv->lock);
  
        return 0;
  }
@@@ -2006,10 -1983,8 +1982,8 @@@ static int bttv_g_frequency(struct fil
        struct bttv_fh *fh  = priv;
        struct bttv *btv = fh->btv;
  
-       mutex_lock(&btv->lock);
        f->type = btv->radio_user ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
        f->frequency = btv->freq;
-       mutex_unlock(&btv->lock);
  
        return 0;
  }
@@@ -2024,7 -1999,6 +1998,6 @@@ static int bttv_s_frequency(struct fil
        if (unlikely(f->tuner != 0))
                return -EINVAL;
  
-       mutex_lock(&btv->lock);
        err = v4l2_prio_check(&btv->prio, fh->prio);
        if (unlikely(err))
                goto err;
@@@ -2039,7 -2013,6 +2012,6 @@@
        if (btv->has_matchbox && btv->radio_user)
                tea5757_set_freq(btv, btv->freq);
  err:
-       mutex_unlock(&btv->lock);
  
        return 0;
  }
@@@ -2172,7 -2145,6 +2144,6 @@@ limit_scaled_size_lock       (struct bt
  
        /* Make sure tvnorm, vbi_end and the current cropping parameters
           remain consistent until we're done. */
-       mutex_lock(&btv->lock);
  
        b = &bttv_tvnorms[btv->tvnorm].cropcap.bounds;
  
@@@ -2250,7 -2222,6 +2221,6 @@@
        rc = 0; /* success */
  
   fail:
-       mutex_unlock(&btv->lock);
  
        return rc;
  }
@@@ -2282,9 -2253,7 +2252,7 @@@ verify_window_lock              (struct bttv_fh 
        if (V4L2_FIELD_ANY == field) {
                __s32 height2;
  
-               mutex_lock(&fh->btv->lock);
                height2 = fh->btv->crop[!!fh->do_crop].rect.height >> 1;
-               mutex_unlock(&fh->btv->lock);
                field = (win->w.height > height2)
                        ? V4L2_FIELD_INTERLACED
                        : V4L2_FIELD_TOP;
@@@ -2360,7 -2329,6 +2328,6 @@@ static int setup_window_lock(struct btt
                }
        }
  
-       mutex_lock(&fh->cap.vb_lock);
        /* clip against screen */
        if (NULL != btv->fbuf.base)
                n = btcx_screen_clips(btv->fbuf.fmt.width, btv->fbuf.fmt.height,
@@@ -2391,13 -2359,6 +2358,6 @@@
        fh->ov.field    = win->field;
        fh->ov.setup_ok = 1;
  
-       /*
-        * FIXME: btv is protected by btv->lock mutex, while btv->init
-        *        is protected by fh->cap.vb_lock. This seems to open the
-        *        possibility for some race situations. Maybe the better would
-        *        be to unify those locks or to use another way to store the
-        *        init values that will be consumed by videobuf callbacks
-        */
        btv->init.ov.w.width   = win->w.width;
        btv->init.ov.w.height  = win->w.height;
        btv->init.ov.field     = win->field;
@@@ -2412,7 -2373,6 +2372,6 @@@
                bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
                retval = bttv_switch_overlay(btv,fh,new);
        }
-       mutex_unlock(&fh->cap.vb_lock);
        return retval;
  }
  
@@@ -2526,9 -2486,7 +2485,7 @@@ static int bttv_try_fmt_vid_cap(struct 
        if (V4L2_FIELD_ANY == field) {
                __s32 height2;
  
-               mutex_lock(&btv->lock);
                height2 = btv->crop[!!fh->do_crop].rect.height >> 1;
-               mutex_unlock(&btv->lock);
                field = (f->fmt.pix.height > height2)
                        ? V4L2_FIELD_INTERLACED
                        : V4L2_FIELD_BOTTOM;
@@@ -2614,7 -2572,6 +2571,6 @@@ static int bttv_s_fmt_vid_cap(struct fi
        fmt = format_by_fourcc(f->fmt.pix.pixelformat);
  
        /* update our state informations */
-       mutex_lock(&fh->cap.vb_lock);
        fh->fmt              = fmt;
        fh->cap.field        = f->fmt.pix.field;
        fh->cap.last         = V4L2_FIELD_NONE;
@@@ -2623,7 -2580,6 +2579,6 @@@
        btv->init.fmt        = fmt;
        btv->init.width      = f->fmt.pix.width;
        btv->init.height     = f->fmt.pix.height;
-       mutex_unlock(&fh->cap.vb_lock);
  
        return 0;
  }
@@@ -2649,11 -2605,9 +2604,9 @@@ static int vidiocgmbuf(struct file *fil
        unsigned int i;
        struct bttv_fh *fh = priv;
  
-       mutex_lock(&fh->cap.vb_lock);
        retval = __videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
                                     V4L2_MEMORY_MMAP);
        if (retval < 0) {
-               mutex_unlock(&fh->cap.vb_lock);
                return retval;
        }
  
@@@ -2665,7 -2619,6 +2618,6 @@@
        for (i = 0; i < gbuffers; i++)
                mbuf->offsets[i] = i * gbufsize;
  
-       mutex_unlock(&fh->cap.vb_lock);
        return 0;
  }
  #endif
@@@ -2775,10 -2728,8 +2727,8 @@@ static int bttv_overlay(struct file *fi
        int retval = 0;
  
        if (on) {
-               mutex_lock(&fh->cap.vb_lock);
                /* verify args */
                if (unlikely(!btv->fbuf.base)) {
-                       mutex_unlock(&fh->cap.vb_lock);
                        return -EINVAL;
                }
                if (unlikely(!fh->ov.setup_ok)) {
@@@ -2787,13 -2738,11 +2737,11 @@@
                }
                if (retval)
                        return retval;
-               mutex_unlock(&fh->cap.vb_lock);
        }
  
        if (!check_alloc_btres_lock(btv, fh, RESOURCE_OVERLAY))
                return -EBUSY;
  
-       mutex_lock(&fh->cap.vb_lock);
        if (on) {
                fh->ov.tvnorm = btv->tvnorm;
                new = videobuf_sg_alloc(sizeof(*new));
@@@ -2805,7 -2754,6 +2753,6 @@@
  
        /* switch over */
        retval = bttv_switch_overlay(btv, fh, new);
-       mutex_unlock(&fh->cap.vb_lock);
        return retval;
  }
  
@@@ -2844,7 -2792,6 +2791,6 @@@ static int bttv_s_fbuf(struct file *fil
        }
  
        /* ok, accept it */
-       mutex_lock(&fh->cap.vb_lock);
        btv->fbuf.base       = fb->base;
        btv->fbuf.fmt.width  = fb->fmt.width;
        btv->fbuf.fmt.height = fb->fmt.height;
@@@ -2876,7 -2823,6 +2822,6 @@@
                        retval = bttv_switch_overlay(btv, fh, new);
                }
        }
-       mutex_unlock(&fh->cap.vb_lock);
        return retval;
  }
  
@@@ -2955,7 -2901,6 +2900,6 @@@ static int bttv_queryctrl(struct file *
             c->id >= V4L2_CID_PRIVATE_LASTP1))
                return -EINVAL;
  
-       mutex_lock(&btv->lock);
        if (!btv->volume_gpio && (c->id == V4L2_CID_AUDIO_VOLUME))
                *c = no_ctl;
        else {
@@@ -2963,7 -2908,6 +2907,6 @@@
  
                *c = (NULL != ctrl) ? *ctrl : no_ctl;
        }
-       mutex_unlock(&btv->lock);
  
        return 0;
  }
@@@ -2974,10 -2918,8 +2917,8 @@@ static int bttv_g_parm(struct file *fil
        struct bttv_fh *fh = f;
        struct bttv *btv = fh->btv;
  
-       mutex_lock(&btv->lock);
        v4l2_video_std_frame_period(bttv_tvnorms[btv->tvnorm].v4l2_id,
                                    &parm->parm.capture.timeperframe);
-       mutex_unlock(&btv->lock);
  
        return 0;
  }
@@@ -2993,7 -2935,6 +2934,6 @@@ static int bttv_g_tuner(struct file *fi
        if (0 != t->index)
                return -EINVAL;
  
-       mutex_lock(&btv->lock);
        t->rxsubchans = V4L2_TUNER_SUB_MONO;
        bttv_call_all(btv, tuner, g_tuner, t);
        strcpy(t->name, "Television");
@@@ -3005,7 -2946,6 +2945,6 @@@
        if (btv->audio_mode_gpio)
                btv->audio_mode_gpio(btv, t, 0);
  
-       mutex_unlock(&btv->lock);
        return 0;
  }
  
@@@ -3014,9 -2954,7 +2953,7 @@@ static int bttv_g_priority(struct file 
        struct bttv_fh *fh = f;
        struct bttv *btv = fh->btv;
  
-       mutex_lock(&btv->lock);
        *p = v4l2_prio_max(&btv->prio);
-       mutex_unlock(&btv->lock);
  
        return 0;
  }
@@@ -3028,9 -2966,7 +2965,7 @@@ static int bttv_s_priority(struct file 
        struct bttv *btv = fh->btv;
        int     rc;
  
-       mutex_lock(&btv->lock);
        rc = v4l2_prio_change(&btv->prio, &fh->prio, prio);
-       mutex_unlock(&btv->lock);
  
        return rc;
  }
@@@ -3045,9 -2981,7 +2980,7 @@@ static int bttv_cropcap(struct file *fi
            cap->type != V4L2_BUF_TYPE_VIDEO_OVERLAY)
                return -EINVAL;
  
-       mutex_lock(&btv->lock);
        *cap = bttv_tvnorms[btv->tvnorm].cropcap;
-       mutex_unlock(&btv->lock);
  
        return 0;
  }
@@@ -3065,9 -2999,7 +2998,7 @@@ static int bttv_g_crop(struct file *fil
           inconsistent with fh->width or fh->height and apps
           do not expect a change here. */
  
-       mutex_lock(&btv->lock);
        crop->c = btv->crop[!!fh->do_crop].rect;
-       mutex_unlock(&btv->lock);
  
        return 0;
  }
@@@ -3091,17 -3023,14 +3022,14 @@@ static int bttv_s_crop(struct file *fil
        /* Make sure tvnorm, vbi_end and the current cropping
           parameters remain consistent until we're done. Note
           read() may change vbi_end in check_alloc_btres_lock(). */
-       mutex_lock(&btv->lock);
        retval = v4l2_prio_check(&btv->prio, fh->prio);
        if (0 != retval) {
-               mutex_unlock(&btv->lock);
                return retval;
        }
  
        retval = -EBUSY;
  
        if (locked_btres(fh->btv, VIDEO_RESOURCES)) {
-               mutex_unlock(&btv->lock);
                return retval;
        }
  
@@@ -3113,7 -3042,6 +3041,6 @@@
  
        b_top = max(b->top, btv->vbi_end);
        if (b_top + 32 >= b_bottom) {
-               mutex_unlock(&btv->lock);
                return retval;
        }
  
@@@ -3136,12 -3064,8 +3063,8 @@@
  
        btv->crop[1] = c;
  
-       mutex_unlock(&btv->lock);
- 
        fh->do_crop = 1;
  
-       mutex_lock(&fh->cap.vb_lock);
- 
        if (fh->width < c.min_scaled_width) {
                fh->width = c.min_scaled_width;
                btv->init.width = c.min_scaled_width;
@@@ -3158,8 -3082,6 +3081,6 @@@
                btv->init.height = c.max_scaled_height;
        }
  
-       mutex_unlock(&fh->cap.vb_lock);
- 
        return 0;
  }
  
@@@ -3227,7 -3149,6 +3148,6 @@@ static unsigned int bttv_poll(struct fi
                return videobuf_poll_stream(file, &fh->vbi, wait);
        }
  
-       mutex_lock(&fh->cap.vb_lock);
        if (check_btres(fh,RESOURCE_VIDEO_STREAM)) {
                /* streaming capture */
                if (list_empty(&fh->cap.stream))
@@@ -3262,7 -3183,6 +3182,6 @@@
        else
                rc = 0;
  err:
-       mutex_unlock(&fh->cap.vb_lock);
        return rc;
  }
  
@@@ -3293,23 -3213,11 +3212,11 @@@ static int bttv_open(struct file *file
                return -ENOMEM;
        file->private_data = fh;
  
-       /*
-        * btv is protected by btv->lock mutex, while btv->init and other
-        * streaming vars are protected by fh->cap.vb_lock. We need to take
-        * care of both locks to avoid troubles. However, vb_lock is used also
-        * inside videobuf, without calling buf->lock. So, it is a very bad
-        * idea to hold both locks at the same time.
-        * Let's first copy btv->init at fh, holding cap.vb_lock, and then work
-        * with the rest of init, holding btv->lock.
-        */
-       mutex_lock(&fh->cap.vb_lock);
        *fh = btv->init;
-       mutex_unlock(&fh->cap.vb_lock);
  
        fh->type = type;
        fh->ov.setup_ok = 0;
  
-       mutex_lock(&btv->lock);
        v4l2_prio_open(&btv->prio, &fh->prio);
  
        videobuf_queue_sg_init(&fh->cap, &bttv_video_qops,
@@@ -3317,13 -3225,13 +3224,13 @@@
                            V4L2_BUF_TYPE_VIDEO_CAPTURE,
                            V4L2_FIELD_INTERLACED,
                            sizeof(struct bttv_buffer),
-                           fh, NULL);
+                           fh, &btv->lock);
        videobuf_queue_sg_init(&fh->vbi, &bttv_vbi_qops,
                            &btv->c.pci->dev, &btv->s_lock,
                            V4L2_BUF_TYPE_VBI_CAPTURE,
                            V4L2_FIELD_SEQ_TB,
                            sizeof(struct bttv_buffer),
-                           fh, NULL);
+                           fh, &btv->lock);
        set_tvnorm(btv,btv->tvnorm);
        set_input(btv, btv->input, btv->tvnorm);
  
@@@ -3346,7 -3254,6 +3253,6 @@@
        bttv_vbi_fmt_reset(&fh->vbi_fmt, btv->tvnorm);
  
        bttv_field_count(btv);
-       mutex_unlock(&btv->lock);
        return 0;
  }
  
@@@ -3355,7 -3262,6 +3261,6 @@@ static int bttv_release(struct file *fi
        struct bttv_fh *fh = file->private_data;
        struct bttv *btv = fh->btv;
  
-       mutex_lock(&btv->lock);
        /* turn off overlay */
        if (check_btres(fh, RESOURCE_OVERLAY))
                bttv_switch_overlay(btv,fh,NULL);
@@@ -3381,14 -3287,8 +3286,8 @@@
  
        /* free stuff */
  
-       /*
-        * videobuf uses cap.vb_lock - we should avoid holding btv->lock,
-        * otherwise we may have dead lock conditions
-        */
-       mutex_unlock(&btv->lock);
        videobuf_mmap_free(&fh->cap);
        videobuf_mmap_free(&fh->vbi);
-       mutex_lock(&btv->lock);
        v4l2_prio_close(&btv->prio, fh->prio);
        file->private_data = NULL;
        kfree(fh);
@@@ -3398,7 -3298,6 +3297,6 @@@
  
        if (!btv->users)
                audio_mute(btv, 1);
-       mutex_unlock(&btv->lock);
  
        return 0;
  }
@@@ -3502,11 -3401,8 +3400,8 @@@ static int radio_open(struct file *file
        if (unlikely(!fh))
                return -ENOMEM;
        file->private_data = fh;
-       mutex_lock(&fh->cap.vb_lock);
        *fh = btv->init;
-       mutex_unlock(&fh->cap.vb_lock);
  
-       mutex_lock(&btv->lock);
        v4l2_prio_open(&btv->prio, &fh->prio);
  
        btv->radio_user++;
@@@ -3514,7 -3410,6 +3409,6 @@@
        bttv_call_all(btv, tuner, s_radio);
        audio_input(btv,TVAUDIO_INPUT_RADIO);
  
-       mutex_unlock(&btv->lock);
        return 0;
  }
  
@@@ -3524,7 -3419,6 +3418,6 @@@ static int radio_release(struct file *f
        struct bttv *btv = fh->btv;
        struct rds_command cmd;
  
-       mutex_lock(&btv->lock);
        v4l2_prio_close(&btv->prio, fh->prio);
        file->private_data = NULL;
        kfree(fh);
@@@ -3532,7 -3426,6 +3425,6 @@@
        btv->radio_user--;
  
        bttv_call_all(btv, core, ioctl, RDS_CMD_CLOSE, &cmd);
-       mutex_unlock(&btv->lock);
  
        return 0;
  }
@@@ -3561,7 -3454,6 +3453,6 @@@ static int radio_g_tuner(struct file *f
                return -EINVAL;
        if (0 != t->index)
                return -EINVAL;
-       mutex_lock(&btv->lock);
        strcpy(t->name, "Radio");
        t->type = V4L2_TUNER_RADIO;
  
@@@ -3570,8 -3462,6 +3461,6 @@@
        if (btv->audio_mode_gpio)
                btv->audio_mode_gpio(btv, t, 0);
  
-       mutex_unlock(&btv->lock);
- 
        return 0;
  }
  
@@@ -3692,7 -3582,7 +3581,7 @@@ static const struct v4l2_file_operation
        .open     = radio_open,
        .read     = radio_read,
        .release  = radio_release,
-       .ioctl    = video_ioctl2,
+       .unlocked_ioctl = video_ioctl2,
        .poll     = radio_poll,
  };