Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 078880e4c8c0..75e3d41382f2 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -224,13 +224,13 @@ int video_exclusive_open(struct inode *inode, struct file *file)
         struct  video_device *vfl = video_devdata(file);
         int retval = 0;
 
-        down(&vfl->lock);
+        mutex_lock(&vfl->lock);
         if (vfl->users) {
                 retval = -EBUSY;
         } else {
                 vfl->users++;
         }
-        up(&vfl->lock);
+        mutex_unlock(&vfl->lock);
         return retval;
 }
 
@@ -279,23 +279,23 @@ int video_register_device(struct video_device *vfd, int type, int nr)
         switch(type)
         {
                 case VFL_TYPE_GRABBER:
-                        base=0;
-                        end=64;
+                        base=MINOR_VFL_TYPE_GRABBER_MIN;
+                        end=MINOR_VFL_TYPE_GRABBER_MAX+1;
                         name_base = "video";
                         break;
                 case VFL_TYPE_VTX:
-                        base=192;
-                        end=224;
+                        base=MINOR_VFL_TYPE_VTX_MIN;
+                        end=MINOR_VFL_TYPE_VTX_MAX+1;
                         name_base = "vtx";
                         break;
                 case VFL_TYPE_VBI:
-                        base=224;
-                        end=256;
+                        base=MINOR_VFL_TYPE_VBI_MIN;
+                        end=MINOR_VFL_TYPE_VBI_MAX+1;
                         name_base = "vbi";
                         break;
                 case VFL_TYPE_RADIO:
-                        base=64;
-                        end=128;
+                        base=MINOR_VFL_TYPE_RADIO_MIN;
+                        end=MINOR_VFL_TYPE_RADIO_MAX+1;
                         name_base = "radio";
                         break;
                 default:
@@ -328,7 +328,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
         sprintf(vfd->devfs_name, "v4l/%s%d", name_base, i - base);
         devfs_mk_cdev(MKDEV(VIDEO_MAJOR, vfd->minor),
                         S_IFCHR | S_IRUSR | S_IWUSR, vfd->devfs_name);
-        init_MUTEX(&vfd->lock);
+        mutex_init(&vfd->lock);
 
         /* sysfs class */
         memset(&vfd->class_dev, 0x00, sizeof(vfd->class_dev));