Merge tag 'char-misc-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[sfrench/cifs-2.6.git] / drivers / uio / uio.c

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 5d421d7e8904fc633f9f25c0faf6d69ec1d8f498..70a7981b94b3fd854b0e4ef7460cd4eebce8ec9b 100644 (file)
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/uio/uio.c
  *
@@ -9,8 +10,6 @@
  * Userspace IO
  *
  * Base Functions
- *
- * Licensed under the GPLv2 only.
  */
 
 #include <linux/module.h>
@@ -443,13 +442,10 @@ static irqreturn_t uio_interrupt(int irq, void *dev_id)
        struct uio_device *idev = (struct uio_device *)dev_id;
        irqreturn_t ret;
 
-       mutex_lock(&idev->info_lock);
-
        ret = idev->info->handler(irq, idev->info);
        if (ret == IRQ_HANDLED)
                uio_event_notify(idev->info);
 
-       mutex_unlock(&idev->info_lock);
        return ret;
 }
 
@@ -625,6 +621,12 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
        ssize_t retval;
        s32 irq_on;
 
+       if (count != sizeof(s32))
+               return -EINVAL;
+
+       if (copy_from_user(&irq_on, buf, count))
+               return -EFAULT;
+
        mutex_lock(&idev->info_lock);
        if (!idev->info) {
                retval = -EINVAL;
@@ -636,21 +638,11 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
                goto out;
        }
 
-       if (count != sizeof(s32)) {
-               retval = -EINVAL;
-               goto out;
-       }
-
        if (!idev->info->irqcontrol) {
                retval = -ENOSYS;
                goto out;
        }
 
-       if (copy_from_user(&irq_on, buf, count)) {
-               retval = -EFAULT;
-               goto out;
-       }
-
        retval = idev->info->irqcontrol(idev->info, irq_on);
 
 out:
@@ -814,7 +806,7 @@ static int uio_mmap(struct file *filep, struct vm_area_struct *vma)
 
 out:
        mutex_unlock(&idev->info_lock);
-       return 0;
+       return ret;
 }
 
 static const struct file_operations uio_fops = {
@@ -958,8 +950,6 @@ int __uio_register_device(struct module *owner,
        if (ret)
                goto err_uio_dev_add_attributes;
 
-       info->uio_dev = idev;
-
        if (info->irq && (info->irq != UIO_IRQ_CUSTOM)) {
                /*
                 * Note that we deliberately don't use devm_request_irq
@@ -969,13 +959,13 @@ int __uio_register_device(struct module *owner,
                 * FDs at the time of unregister and therefore may not be
                 * freed until they are released.
                 */
-               ret = request_threaded_irq(info->irq, NULL, uio_interrupt,
-                                          info->irq_flags, info->name, idev);
-
+               ret = request_irq(info->irq, uio_interrupt,
+                                 info->irq_flags, info->name, idev);
                if (ret)
                        goto err_request_irq;
        }
 
+       info->uio_dev = idev;
        return 0;
 
 err_request_irq: