ChangeSet 1.1982.131.4, 2005/03/07 14:02:01-05:00, [EMAIL PROTECTED]
Fix a partial conversion to unlocked_ioctl().
drivers/ieee1394/dv1394.c: In function `handle_dv1394_init':
drivers/ieee1394/dv1394.c:2529: warning: comparison of distinct pointer
types lacks a cast
drivers/ieee1394/dv1394.c: In function `handle_dv1394_get_status':
drivers/ieee1394/dv1394.c:2559: warning: comparison of distinct pointer
types lacks a cast
drivers/ieee1394/dv1394.c: In function `dv1394_compat_ioctl':
drivers/ieee1394/dv1394.c:2593: warning: unused variable `err'
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Dan Dennedy <[EMAIL PROTECTED]>
Signed-off-by: Jody McIntyre <[EMAIL PROTECTED]>
dv1394.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff -Nru a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
--- a/drivers/ieee1394/dv1394.c 2005-03-28 23:09:14 -08:00
+++ b/drivers/ieee1394/dv1394.c 2005-03-28 23:09:14 -08:00
@@ -2531,7 +2531,7 @@
mm_segment_t old_fs;
int ret;
- if (file->f_op->ioctl != dv1394_ioctl)
+ if (file->f_op->unlocked_ioctl != dv1394_ioctl)
return -EFAULT;
if (copy_from_user(&dv32, (void __user *)arg, sizeof(dv32)))
@@ -2547,8 +2547,7 @@
old_fs = get_fs();
set_fs(KERNEL_DS);
- ret = dv1394_ioctl(file,
- DV1394_IOC_INIT, (unsigned long)&dv);
+ ret = dv1394_ioctl(file, DV1394_IOC_INIT, (unsigned long)&dv);
set_fs(old_fs);
return ret;
@@ -2561,13 +2560,12 @@
mm_segment_t old_fs;
int ret;
- if (file->f_op->ioctl != dv1394_ioctl)
+ if (file->f_op->unlocked_ioctl != dv1394_ioctl)
return -EFAULT;
old_fs = get_fs();
set_fs(KERNEL_DS);
- ret = dv1394_ioctl(file,
- DV1394_IOC_GET_STATUS, (unsigned long)&dv);
+ ret = dv1394_ioctl(file, DV1394_IOC_GET_STATUS, (unsigned long)&dv);
set_fs(old_fs);
if (!ret) {
@@ -2595,7 +2593,6 @@
static long dv1394_compat_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
- int err;
switch (cmd) {
case DV1394_IOC_SHUTDOWN:
case DV1394_IOC_SUBMIT_FRAMES:
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
