summaryrefslogtreecommitdiffstats
path: root/drivers/uio
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2018-11-26 07:50:56 +0100
committerGreg Kroah-Hartman2018-11-26 07:50:56 +0100
commit986fb2e0532b1b0fa1e8312fbc38b9e7ed826547 (patch)
treee571ff6c8cd4bedfd49181125f0bd2993546ed24 /drivers/uio
parentuio: uio_fsl_elbc_gpcm: simplify getting .driver_data (diff)
parentLinux 4.20-rc4 (diff)
downloadkernel-qcow2-linux-986fb2e0532b1b0fa1e8312fbc38b9e7ed826547.tar.gz
kernel-qcow2-linux-986fb2e0532b1b0fa1e8312fbc38b9e7ed826547.tar.xz
kernel-qcow2-linux-986fb2e0532b1b0fa1e8312fbc38b9e7ed826547.zip
Merge 4.20-rc4 into char-misc-next
We want the char/misc fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uio')
-rw-r--r--drivers/uio/uio.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 85644669fbe7..0a357db4b31b 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -961,6 +961,8 @@ 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
@@ -972,11 +974,12 @@ int __uio_register_device(struct module *owner,
*/
ret = request_irq(info->irq, uio_interrupt,
info->irq_flags, info->name, idev);
- if (ret)
+ if (ret) {
+ info->uio_dev = NULL;
goto err_request_irq;
+ }
}
- info->uio_dev = idev;
return 0;
err_request_irq: