From 2d77ac073d4111730347667fd8145d71282ce404 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 6 Oct 2011 02:41:06 -0300 Subject: [PATCH] --- yaml --- r: 271943 b: refs/heads/master c: 06bd801c23939952bc6e1cf65f0e8c0fff09d2d7 h: refs/heads/master i: 271941: c2b4b63bd99ea952302acd74d256c86fb9354097 271939: 1a0851384de5c4d360fb6080c4a097fc2beadd29 271935: ee301396e53efa3d57d1891e236dcfb6364883f7 v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/ir-lirc-codec.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1c62b04600ec..b5fb1409533d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e30528854797f057aa6ffb6dc9f890e923c467fd +refs/heads/master: 06bd801c23939952bc6e1cf65f0e8c0fff09d2d7 diff --git a/trunk/drivers/media/rc/ir-lirc-codec.c b/trunk/drivers/media/rc/ir-lirc-codec.c index e5eeec4da76e..ec2e67fd236b 100644 --- a/trunk/drivers/media/rc/ir-lirc-codec.c +++ b/trunk/drivers/media/rc/ir-lirc-codec.c @@ -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; @@ -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; @@ -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; } @@ -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; }