diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2011-07-27 15:13:21 (GMT) |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-07-27 15:13:21 (GMT) |
| commit | 1ae105aa7416087f2920c35c3cd16831d0d09c9c (patch) | |
| tree | 935b2d7c2b902f77b37e38ec9108f905fb09f690 /drivers/dma/imx-sdma.c | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
| parent | 5a42fb93e6a33224774786691027ef2d9795c245 (diff) | |
| download | linux-1ae105aa7416087f2920c35c3cd16831d0d09c9c.tar.xz | |
Merge branch 'next' into for-linus-3.0
Diffstat (limited to 'drivers/dma/imx-sdma.c')
| -rw-r--r-- | drivers/dma/imx-sdma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index b6d1455..ec53980 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1281,8 +1281,10 @@ static int __init sdma_probe(struct platform_device *pdev) goto err_request_irq; sdma->script_addrs = kzalloc(sizeof(*sdma->script_addrs), GFP_KERNEL); - if (!sdma->script_addrs) + if (!sdma->script_addrs) { + ret = -ENOMEM; goto err_alloc; + } sdma->version = pdata->sdma_version; |