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

Pull UIO fix from Greg KH:
 "Here is a single UIO fix that I forgot to send before 4.18-final came
  out. It reverts a UIO patch that went in the 4.18 development window
  that was causing problems.

  This patch has been in linux-next for a while with no problems, I just
  forgot to send it earlier, or as part of the larger char/misc patch
  series from yesterday, my fault"

* tag 'char-misc-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  Revert "uio: use request_threaded_irq instead"

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 15ad3469660deadf2f2a1d68f767c6229270a2c1..70a7981b94b3fd854b0e4ef7460cd4eebce8ec9b 100644 (file)
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -442,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;
 }
 
@@ -962,9 +959,8 @@ 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;
        }