Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[~andy/linux] / drivers / dma / ppc4xx / adma.c

diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index 8bba298535b0984e241793403af6920399d7366d..ce7a8d7564ba6f96649407a5840323eb92669350 100644 (file)
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -4114,6 +4114,7 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev)
        regs = ioremap(res.start, resource_size(&res));
        if (!regs) {
                dev_err(&ofdev->dev, "failed to ioremap regs!\n");
+               ret = -ENOMEM;
                goto err_regs_alloc;
        }