| Message ID | Y0bWzJL8JknX8MUf@kili (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 99df45c9e0a43b1b88dab294265e2be4a040a441 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] sunhme: fix an IS_ERR() vs NULL check in probe | expand |
On 10/12/22 11:01, Dan Carpenter wrote: > The devm_request_region() function does not return error pointers, it > returns NULL on error. > > Fixes: 914d9b2711dd ("sunhme: switch to devres") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/net/ethernet/sun/sunhme.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c > index 62deed210a95..91f10f746dff 100644 > --- a/drivers/net/ethernet/sun/sunhme.c > +++ b/drivers/net/ethernet/sun/sunhme.c > @@ -2896,8 +2896,8 @@ static int happy_meal_pci_probe(struct pci_dev *pdev, > > hpreg_res = devm_request_region(&pdev->dev, pci_resource_start(pdev, 0), > pci_resource_len(pdev, 0), DRV_NAME); > - if (IS_ERR(hpreg_res)) { > - err = PTR_ERR(hpreg_res); > + if (!hpreg_res) { > + err = -EBUSY; > dev_err(&pdev->dev, "Cannot obtain PCI resources, aborting.\n"); > goto err_out_clear_quattro; > } Reviewed-by: Sean Anderson <seanga2@gmail.com>
Am Mittwoch, 12. Oktober 2022, 17:01:32 CEST schrieb Dan Carpenter: > The devm_request_region() function does not return error pointers, it > returns NULL on error. > > Fixes: 914d9b2711dd ("sunhme: switch to devres") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 12 Oct 2022 18:01:32 +0300 you wrote: > The devm_request_region() function does not return error pointers, it > returns NULL on error. > > Fixes: 914d9b2711dd ("sunhme: switch to devres") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/net/ethernet/sun/sunhme.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Here is the summary with links: - [net] sunhme: fix an IS_ERR() vs NULL check in probe https://git.kernel.org/netdev/net/c/99df45c9e0a4 You are awesome, thank you!
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 62deed210a95..91f10f746dff 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -2896,8 +2896,8 @@ static int happy_meal_pci_probe(struct pci_dev *pdev, hpreg_res = devm_request_region(&pdev->dev, pci_resource_start(pdev, 0), pci_resource_len(pdev, 0), DRV_NAME); - if (IS_ERR(hpreg_res)) { - err = PTR_ERR(hpreg_res); + if (!hpreg_res) { + err = -EBUSY; dev_err(&pdev->dev, "Cannot obtain PCI resources, aborting.\n"); goto err_out_clear_quattro; }
The devm_request_region() function does not return error pointers, it returns NULL on error. Fixes: 914d9b2711dd ("sunhme: switch to devres") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/net/ethernet/sun/sunhme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)