Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 11 insertions, 6 deletions

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 94159b90f733..b915c39d782f 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -154,10 +154,11 @@ int dvb_generic_release(struct inode *inode, struct file *file)
 EXPORT_SYMBOL(dvb_generic_release);
 
 
-int dvb_generic_ioctl(struct inode *inode, struct file *file,
-                      unsigned int cmd, unsigned long arg)
+long dvb_generic_ioctl(struct file *file,
+                       unsigned int cmd, unsigned long arg)
 {
         struct dvb_device *dvbdev = file->private_data;
+        int ret;
 
         if (!dvbdev)
                 return -ENODEV;
@@ -165,7 +166,11 @@ int dvb_generic_ioctl(struct inode *inode, struct file *file,
         if (!dvbdev->kernel_ioctl)
                 return -EINVAL;
 
-        return dvb_usercopy (inode, file, cmd, arg, dvbdev->kernel_ioctl);
+        lock_kernel();
+        ret = dvb_usercopy(file, cmd, arg, dvbdev->kernel_ioctl);
+        unlock_kernel();
+
+        return ret;
 }
 EXPORT_SYMBOL(dvb_generic_ioctl);
 
@@ -377,9 +382,9 @@ EXPORT_SYMBOL(dvb_unregister_adapter);
    define this as video_usercopy(). this will introduce a dependecy
    to the v4l "videodev.o" module, which is unnecessary for some
    cards (ie. the budget dvb-cards don't need the v4l module...) */
-int dvb_usercopy(struct inode *inode, struct file *file,
+int dvb_usercopy(struct file *file,
                      unsigned int cmd, unsigned long arg,
-                     int (*func)(struct inode *inode, struct file *file,
+                     int (*func)(struct file *file,
                      unsigned int cmd, void *arg))
 {
         char    sbuf[128];
@@ -416,7 +421,7 @@ int dvb_usercopy(struct inode *inode, struct file *file,
         }
 
         /* call driver */
-        if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD)
+        if ((err = func(file, cmd, parg)) == -ENOIOCTLCMD)
                 err = -EINVAL;
 
         if (err < 0)