host: ohci-octeon: remove duplicate check on resource
authorVarka Bhadram <varkabhadram@gmail.com>
Tue, 4 Nov 2014 02:21:15 +0000 (07:51 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Nov 2014 17:01:50 +0000 (09:01 -0800)
Sanity check on resource happening with devm_ioremap_resource().

Signed-off-by: Varka Bhadram <varkab@cdac.in>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ohci-octeon.c

index 15af8954085e687b4b67cbe33bd6e89afc333f7f..20d861b6192f0a3c12271fa90446e5167de7d467 100644 (file)
@@ -120,12 +120,6 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res_mem == NULL) {
-               dev_err(&pdev->dev, "No register space assigned\n");
-               return -ENODEV;
-       }
-
        /* Ohci is a 32-bit device. */
        ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
        if (ret)
@@ -135,14 +129,14 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev)
        if (!hcd)
                return -ENOMEM;
 
-       hcd->rsrc_start = res_mem->start;
-       hcd->rsrc_len = resource_size(res_mem);
-
+       res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        reg_base = devm_ioremap_resource(&pdev->dev, res_mem);
        if (IS_ERR(reg_base)) {
                ret = PTR_ERR(reg_base);
                goto err1;
        }
+       hcd->rsrc_start = res_mem->start;
+       hcd->rsrc_len = resource_size(res_mem);
 
        ohci_octeon_hw_start();