Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / rc / lirc_dev.c

diff --git a/drivers/media/IR/lirc_dev.c b/drivers/media/rc/lirc_dev.c
similarity index 98%
rename from drivers/media/IR/lirc_dev.c
rename to drivers/media/rc/lirc_dev.c
index 756656e17bddb035dbff24529155a86e82d19b3c..fd237ab120bbbd8a3a753b379f3edddb41079f61 100644 (file)
--- a/drivers/media/IR/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -178,7 +178,9 @@ static int lirc_cdev_add(struct irctl *ir)
                cdev_init(cdev, &lirc_dev_fops);
                cdev->owner = THIS_MODULE;
        }
-       kobject_set_name(&cdev->kobj, "lirc%d", d->minor);
+       retval = kobject_set_name(&cdev->kobj, "lirc%d", d->minor);
+       if (retval)
+               return retval;
 
        retval = cdev_add(cdev, MKDEV(MAJOR(lirc_base_dev), d->minor), 1);
        if (retval)
@@ -627,7 +629,7 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 EXPORT_SYMBOL(lirc_dev_fop_ioctl);
 
 ssize_t lirc_dev_fop_read(struct file *file,
-                         char *buffer,
+                         char __user *buffer,
                          size_t length,
                          loff_t *ppos)
 {
@@ -747,7 +749,7 @@ void *lirc_get_pdata(struct file *file)
 EXPORT_SYMBOL(lirc_get_pdata);
 
 
-ssize_t lirc_dev_fop_write(struct file *file, const char *buffer,
+ssize_t lirc_dev_fop_write(struct file *file, const char __user *buffer,
                           size_t length, loff_t *ppos)
 {
        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];