diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-21 09:48:31 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-21 09:48:31 +0200 |
commit | 03e3e31ee5c8d45c62c31035578bab5e90133eff (patch) | |
tree | 5cff3fda5bb8278621c27823f52b7e8dd85fb0ef /drivers/uio/uio_pci_generic.c | |
parent | misc: alcor_pci: fix null-ptr-deref when there is no PCI bridge (diff) | |
parent | Merge tag 'char-misc-5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
download | linux-03e3e31ee5c8d45c62c31035578bab5e90133eff.tar.xz linux-03e3e31ee5c8d45c62c31035578bab5e90133eff.zip |
Merge 50f09a3dd587 ("Merge tag 'char-misc-5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into char-misc-next
We want the char/misc driver fixes in here as well
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uio/uio_pci_generic.c')
-rw-r--r-- | drivers/uio/uio_pci_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uio/uio_pci_generic.c b/drivers/uio/uio_pci_generic.c index efc43869131d..e03f9b532a96 100644 --- a/drivers/uio/uio_pci_generic.c +++ b/drivers/uio/uio_pci_generic.c @@ -84,7 +84,7 @@ static int probe(struct pci_dev *pdev, } if (pdev->irq && !pci_intx_mask_supported(pdev)) - return -ENOMEM; + return -ENODEV; gdev = devm_kzalloc(&pdev->dev, sizeof(struct uio_pci_generic_dev), GFP_KERNEL); if (!gdev) |