diff options
author | Peter Griffin <peter.griffin@linaro.org> | 2016-06-07 18:38:41 +0100 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2016-06-21 21:35:00 +0530 |
commit | aef94fea97eb77f86159375825a370b45d9f2fec (patch) | |
tree | 275639d62e6c0920e859e3d22786cb92a4098e04 /drivers/dma/pl330.c | |
parent | 71f7e6cc55003ca6f616ff4094253d28de5d9254 (diff) | |
download | linux-stable-aef94fea97eb77f86159375825a370b45d9f2fec.tar.gz linux-stable-aef94fea97eb77f86159375825a370b45d9f2fec.tar.bz2 linux-stable-aef94fea97eb77f86159375825a370b45d9f2fec.zip |
dmaengine: Remove site specific OOM error messages on kzalloc
If kzalloc() fails it will issue it's own error message including
a dump_stack(). So remove the site specific error messages.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Jon Hunter <jonathanh@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/pl330.c')
-rw-r--r-- | drivers/dma/pl330.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 372b4359da97..c8767d3e5eb0 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2828,10 +2828,8 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) /* Allocate a new DMAC and its Channels */ pl330 = devm_kzalloc(&adev->dev, sizeof(*pl330), GFP_KERNEL); - if (!pl330) { - dev_err(&adev->dev, "unable to allocate mem\n"); + if (!pl330) return -ENOMEM; - } pd = &pl330->ddma; pd->dev = &adev->dev; @@ -2890,7 +2888,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) pl330->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL); if (!pl330->peripherals) { ret = -ENOMEM; - dev_err(&adev->dev, "unable to allocate pl330->peripherals\n"); goto probe_err2; } |