2021-04-22 19:24:56

by Martin Ågren

Subject: [PATCH] uio/uio_pci_generic: fix return value changed in refactoring

Commit ef84928cff58 ("uio/uio_pci_generic: use device-managed function
equivalents") was able to simplify various error paths thanks to no
longer having to clean up on the way out. Some error paths were dropped,
others were simplified. In one of those simplifications, the return
value was accidentally changed from -ENODEV to -ENOMEM. Restore the old
return value.

Fixes: ef84928cff58 ("uio/uio_pci_generic: use device-managed function equivalents")
Signed-off-by: Martin Ågren <[email protected]>
---
This is my first contribution to the Linux kernel. Hints, suggestions,
corrections and any other feedback welcome.

drivers/uio/uio_pci_generic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/uio/uio_pci_generic.c b/drivers/uio/uio_pci_generic.c
index c7d681fef198..3bb0b0075467 100644
--- a/drivers/uio/uio_pci_generic.c
+++ b/drivers/uio/uio_pci_generic.c
@@ -81,9 +81,9 @@ static int probe(struct pci_dev *pdev,
return err;
}

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)
return -ENOMEM;
--
2.31.1.527.g47e6f16901

2021-04-23 20:29:55

by Michael S. Tsirkin

Subject: Re: [PATCH] uio/uio_pci_generic: fix return value changed in refactoring

On Thu, Apr 22, 2021 at 09:22:40PM +0200, Martin ?gren wrote:
> Commit ef84928cff58 ("uio/uio_pci_generic: use device-managed function
> equivalents") was able to simplify various error paths thanks to no
> longer having to clean up on the way out. Some error paths were dropped,
> others were simplified. In one of those simplifications, the return
> value was accidentally changed from -ENODEV to -ENOMEM. Restore the old
> return value.
>
> Fixes: ef84928cff58 ("uio/uio_pci_generic: use device-managed function equivalents")
> Signed-off-by: Martin ?gren <[email protected]>

Acked-by: Michael S. Tsirkin <[email protected]>

> ---
> This is my first contribution to the Linux kernel. Hints, suggestions,
> corrections and any other feedback welcome.
>
> drivers/uio/uio_pci_generic.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/uio/uio_pci_generic.c b/drivers/uio/uio_pci_generic.c
> index c7d681fef198..3bb0b0075467 100644
> --- a/drivers/uio/uio_pci_generic.c
> +++ b/drivers/uio/uio_pci_generic.c
> @@ -81,9 +81,9 @@ static int probe(struct pci_dev *pdev,
> return err;
> }
>
> 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)
> return -ENOMEM;
> --
> 2.31.1.527.g47e6f16901