Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
	drivers/mtd/nand/nand_base.c

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 6fbeebb9486f..d1cc5791476b 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -1892,6 +1892,7 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
         pl08x->pd = dev_get_platdata(&adev->dev);
         if (!pl08x->pd) {
                 dev_err(&adev->dev, "no platform data supplied\n");
+                ret = -EINVAL;
                 goto out_no_platdata;
         }
 
@@ -1943,6 +1944,7 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
                 dev_err(&adev->dev, "%s failed to allocate "
                         "physical channel holders\n",
                         __func__);
+                ret = -ENOMEM;
                 goto out_no_phychans;
         }