Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / drivers / staging / vme / devices / vme_user.c

diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index cdd2ff7..8b1f533 100644 (file)
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -460,11 +460,9 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
                                return -EFAULT;
                        }
 
-                       retval = vme_irq_generate(vme_user_bridge,
+                       return vme_irq_generate(vme_user_bridge,
                                                  irq_req.level,
                                                  irq_req.statid);
-
-                       return retval;
                }
                break;
        case MASTER_MINOR: