Skip to content

Commit

Permalink
[media] rc/ir-lirc-codec: cleanup __user tags
Browse files Browse the repository at this point in the history
The code here treated user pointers correctly, but the __user tags
weren't used correctly so it caused Sparse warnings:

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Dan Carpenter authored and Mauro Carvalho Chehab committed Oct 11, 2011
1 parent e305288 commit 06bd801
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/media/rc/ir-lirc-codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
return 0;
}

static ssize_t ir_lirc_transmit_ir(struct file *file, const char *buf,
static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
size_t n, loff_t *ppos)
{
struct lirc_codec *lirc;
Expand Down Expand Up @@ -140,10 +140,11 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char *buf,
}

static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
unsigned long __user arg)
unsigned long arg)
{
struct lirc_codec *lirc;
struct rc_dev *dev;
u32 __user *argp = (u32 __user *)(arg);
int ret = 0;
__u32 val = 0, tmp;

Expand All @@ -156,7 +157,7 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
return -EFAULT;

if (_IOC_DIR(cmd) & _IOC_WRITE) {
ret = get_user(val, (__u32 *)arg);
ret = get_user(val, argp);
if (ret)
return ret;
}
Expand Down Expand Up @@ -265,7 +266,7 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
}

if (_IOC_DIR(cmd) & _IOC_READ)
ret = put_user(val, (__u32 *)arg);
ret = put_user(val, argp);

return ret;
}
Expand Down

0 comments on commit 06bd801

Please sign in to comment.