From 3efe313510a75942d1338c46baa59d6372dc78e0 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 24 Nov 2011 05:06:21 -0300 Subject: [PATCH] --- yaml --- r: 285321 b: refs/heads/master c: 87d466e503ab1e071eac4bd89c46eb3cb53246a1 h: refs/heads/master i: 285319: 42fb108947f1e006d992498e769e3d9cabbfc537 v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/lirc/lirc_imon.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 04364bebe26b..da2845d4bdcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75c1ca364d0d5d70ad12c5dac40bbe6598624cab +refs/heads/master: 87d466e503ab1e071eac4bd89c46eb3cb53246a1 diff --git a/trunk/drivers/staging/media/lirc/lirc_imon.c b/trunk/drivers/staging/media/lirc/lirc_imon.c index f5308d5929c6..c1654b18610e 100644 --- a/trunk/drivers/staging/media/lirc/lirc_imon.c +++ b/trunk/drivers/staging/media/lirc/lirc_imon.c @@ -63,7 +63,7 @@ static int display_open(struct inode *inode, struct file *file); static int display_close(struct inode *inode, struct file *file); /* VFD write operation */ -static ssize_t vfd_write(struct file *file, const char *buf, +static ssize_t vfd_write(struct file *file, const char __user *buf, size_t n_bytes, loff_t *pos); /* LIRC driver function prototypes */ @@ -369,7 +369,7 @@ static int send_packet(struct imon_context *context) * than 32 bytes are provided spaces will be appended to * generate a full screen. */ -static ssize_t vfd_write(struct file *file, const char *buf, +static ssize_t vfd_write(struct file *file, const char __user *buf, size_t n_bytes, loff_t *pos) { int i;