uio: Reduce return paths from uio_write()

Drive all return paths for uio_write() through a single block at the
end of the function.

Signed-off-by: Hamish Martin <[email protected]>
Reviewed-by: Chris Packham <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index d9235f30e46d6385cf2639173bbd4605b41a2d57..1883ce620ea90c8532cd21149050652952050590 100644 (file)
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -568,20 +568,29 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
        ssize_t retval;
        s32 irq_on;
 
-       if (!idev->info->irq)
-               return -EIO;
+       if (!idev->info->irq) {
+               retval = -EIO;
+               goto out;
+       }
 
-       if (count != sizeof(s32))
-               return -EINVAL;
+       if (count != sizeof(s32)) {
+               retval = -EINVAL;
+               goto out;
+       }
 
-       if (!idev->info->irqcontrol)
-               return -ENOSYS;
+       if (!idev->info->irqcontrol) {
+               retval = -ENOSYS;
+               goto out;
+       }
 
-       if (copy_from_user(&irq_on, buf, count))
-               return -EFAULT;
+       if (copy_from_user(&irq_on, buf, count)) {
+               retval = -EFAULT;
+               goto out;
+       }
 
        retval = idev->info->irqcontrol(idev->info, irq_on);
 
+out:
        return retval ? retval : sizeof(s32);
 }