iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uio: Reduce return paths from uio_write()

Browse Source 
commit 81daa406c2cc97d85eef9409400404efc2a3f756 upstream.

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

Signed-off-by: Hamish Martin <hamish.martin@alliedtelesis.co.nz>
Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hamish Martin 2019-02-13 16:29:24 +00:00 committed by Greg Kroah-Hartman
parent 943f5f2a7d
commit cd4fe6339c
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/uio/uio.c
View File

@ -570,20 +570,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);
}