]> git.itanic.dy.fi Git - linux-stable/commitdiff
net: sunhme: Fix region request
authorSean Anderson <seanga2@gmail.com>
Wed, 22 Feb 2023 20:42:41 +0000 (15:42 -0500)
committerJakub Kicinski <kuba@kernel.org>
Thu, 23 Feb 2023 17:58:51 +0000 (09:58 -0800)
devm_request_region is for I/O regions. Use devm_request_mem_region
instead.  This fixes the driver failing to probe since 99df45c9e0a4
("sunhme: fix an IS_ERR() vs NULL check in probe"), which checked the
result.

Fixes: 914d9b2711dd ("sunhme: switch to devres")
Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Link: https://lore.kernel.org/r/20230222204242.2658247-1-seanga2@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/sun/sunhme.c

index 1c16548415cddabf7f07fe7ad0b0fa97228c6cdb..b0c7ab74a82ed11b0f70495d78acd1d6971f0dc0 100644 (file)
@@ -2894,8 +2894,10 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,
                goto err_out_clear_quattro;
        }
 
-       hpreg_res = devm_request_region(&pdev->dev, pci_resource_start(pdev, 0),
-                                       pci_resource_len(pdev, 0), DRV_NAME);
+       hpreg_res = devm_request_mem_region(&pdev->dev,
+                                           pci_resource_start(pdev, 0),
+                                           pci_resource_len(pdev, 0),
+                                           DRV_NAME);
        if (!hpreg_res) {
                err = -EBUSY;
                dev_err(&pdev->dev, "Cannot obtain PCI resources, aborting.\n");