From ffb3f7b56eee23e1485b896fb5045c270590ab12 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Tue, 14 Aug 2012 14:58:32 +0200 Subject: [PATCH] --- yaml --- r: 332861 b: refs/heads/master c: 983d7beb7de4ba7c715ea62e982c9fe54fa554a1 h: refs/heads/master i: 332859: d2ba0cd1fff9f5a5d398f8bce668aa7f0a633f7a v: v3 --- [refs] | 2 +- trunk/drivers/dma/amba-pl08x.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index aacd0d599364..d187fc892d68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94d3901c11ab4115740ec3891d07f086f18c8cd6 +refs/heads/master: 983d7beb7de4ba7c715ea62e982c9fe54fa554a1 diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c index 6fbeebb9486f..d1cc5791476b 100644 --- a/trunk/drivers/dma/amba-pl08x.c +++ b/trunk/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; }