Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / spi / spi-ep93xx.c

diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index aecbff16ad60ca3e1f99a3b8692a6a0b3b5ca7ac..d7bac60253c9c92cd2b542b9a17e8bd9d4088291 100644 (file)
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -1085,10 +1085,9 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
 
        espi->sspdr_phys = res->start + SSPDR;
 
-       espi->regs_base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!espi->regs_base) {
-               dev_err(&pdev->dev, "failed to map resources\n");
-               error = -ENODEV;
+       espi->regs_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(espi->regs_base)) {
+               error = PTR_ERR(espi->regs_base);
                goto fail_put_clock;
        }