Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

[pandora-kernel.git] / drivers / dma / ste_dma40.c

diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index d9ca3e3..15d4946 100644 (file)
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -3432,6 +3432,7 @@ static int __init d40_lcla_allocate(struct d40_base *base)
 
                        d40_err(base->dev, "Failed to allocate %d pages.\n",
                                base->lcla_pool.pages);
+                       ret = -ENOMEM;
 
                        for (j = 0; j < i; j++)
                                free_pages(page_list[j], base->lcla_pool.pages);
@@ -3749,7 +3750,6 @@ static const struct of_device_id d40_match[] = {
 
 static struct platform_driver d40_driver = {
        .driver = {
-               .owner = THIS_MODULE,
                .name  = D40_NAME,
                .pm = &dma40_pm_ops,
                .of_match_table = d40_match,