]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
spi: bcm63xx-hsspi: checking for ERR_PTR instead of NULL
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 6 Dec 2013 14:12:13 +0000 (17:12 +0300)
committerMark Brown <broonie@linaro.org>
Mon, 9 Dec 2013 17:24:21 +0000 (17:24 +0000)
devm_request_and_ioremap() returns NULL on error, it doesn't return an
ERR_PTR().  This patch fixes it by switching to devm_ioremap_resource()
which is the prefered function anyway.

Fixes: 142168eba9dc ('spi: bcm63xx-hsspi: add bcm63xx HSSPI driver')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-bcm63xx-hsspi.c

index bc8d848d33b7795439b276d6c07dd35934edb9bc..2cfe8eb619fdf24db0bbd47ec6a4b7b51fbdf1cd 100644 (file)
@@ -338,7 +338,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
        }
 
        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       regs = devm_request_and_ioremap(dev, res_mem);
+       regs = devm_ioremap_resource(dev, res_mem);
        if (IS_ERR(regs))
                return PTR_ERR(regs);