Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / media / video / saa7134 / saa7134-empress.c

diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 7ed4eaf05e131112bc64bcb7bbf57b4ef3df45a0..34ca874dd7fe4e8a65a8643a682954ae1fb80e15 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -76,17 +76,14 @@ static int ts_init_encoder(struct saa7134_dev* dev)
 static int ts_open(struct inode *inode, struct file *file)
 {
        int minor = iminor(inode);
-       struct saa7134_dev *h,*dev = NULL;
-       struct list_head *list;
+       struct saa7134_dev *dev;
        int err;
 
-       list_for_each(list,&saa7134_devlist) {
-               h = list_entry(list, struct saa7134_dev, devlist);
-               if (h->empress_dev && h->empress_dev->minor == minor)
-                       dev = h;
-       }
-       if (NULL == dev)
-               return -ENODEV;
+       list_for_each_entry(dev, &saa7134_devlist, devlist)
+               if (dev->empress_dev && dev->empress_dev->minor == minor)
+                       goto found;
+       return -ENODEV;
+ found:
 
        dprintk("open minor=%d\n",minor);
        err = -EBUSY;
@@ -400,7 +397,7 @@ static int empress_init(struct saa7134_dev *dev)
        printk(KERN_INFO "%s: registered device video%d [mpeg]\n",
               dev->name,dev->empress_dev->minor & 0x1f);
 
-       videobuf_queue_init(&dev->empress_tsq, &saa7134_ts_qops,
+       videobuf_queue_pci_init(&dev->empress_tsq, &saa7134_ts_qops,
                            dev->pci, &dev->slock,
                            V4L2_BUF_TYPE_VIDEO_CAPTURE,
                            V4L2_FIELD_ALTERNATE,