Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / cbus / retu-user.c

diff --git a/drivers/cbus/retu-user.c b/drivers/cbus/retu-user.c
index 3245945bebb9809a82d37124a780be449f831416..74a7d612e7ec677c9432fe1d1cf31a395ec9ef02 100644 (file)
--- a/drivers/cbus/retu-user.c
+++ b/drivers/cbus/retu-user.c
@@ -272,6 +272,7 @@ static int retu_ioctl(struct inode *inode, struct file *filp,
                      unsigned int cmd, unsigned long arg)
 {
        struct retu_tahvo_write_parms par;
+       int ret;
 
        switch (cmd) {
        case URT_IOCT_IRQ_SUBSCR:
@@ -279,9 +280,13 @@ static int retu_ioctl(struct inode *inode, struct file *filp,
        case RETU_IOCH_READ:
                return retu_user_read_with_mask(arg);
        case RETU_IOCX_WRITE:
-               copy_from_user(&par, (void __user *) arg, sizeof(par));
+               ret = copy_from_user(&par, (void __user *) arg, sizeof(par));
+               if (ret)
+                       printk(KERN_ERR "copy_from_user failed: %d\n", ret);
                par.result = retu_user_write_with_mask(par.field, par.value);
-               copy_to_user((void __user *) arg, &par, sizeof(par));
+               ret = copy_to_user((void __user *) arg, &par, sizeof(par));
+               if (ret)
+                       printk(KERN_ERR "copy_to_user failed: %d\n", ret);
                break;
        case RETU_IOCH_ADC_READ:
                return retu_read_adc(arg);
@@ -326,8 +331,10 @@ static ssize_t retu_read(struct file *filp, char *buf, size_t count,
                list_move(&irq->node, &retu_irqs_reserve);
                spin_unlock_irqrestore(&retu_irqs_lock, flags);
 
-               copy_to_user(buf + i * sizeof(irq_id), &irq_id, sizeof(irq_id));
-
+               ret = copy_to_user(buf + i * sizeof(irq_id), &irq_id,
+                                  sizeof(irq_id));
+               if (ret)
+                       printk(KERN_ERR "copy_to_user failed: %d\n", ret);
        }
 
        return count;