← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/arm/mach-omap1/dma.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-omap1/dma.c
284
284
        dma_base = ioremap(res[0].start, resource_size(&res[0]));
285
285
        if (!dma_base) {
286
286
                pr_err("%s: Unable to ioremap\n", __func__);
287
 
                return -ENODEV;
 
287
                ret = -ENODEV;
 
288
                goto exit_device_put;
288
289
        }
289
290
 
290
291
        ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res));
291
292
        if (ret) {
292
293
                dev_err(&pdev->dev, "%s: Unable to add resources for %s%d\n",
293
294
                        __func__, pdev->name, pdev->id);
294
 
                goto exit_device_del;
 
295
                goto exit_device_put;
295
296
        }
296
297
 
297
298
        p = kzalloc(sizeof(struct omap_system_dma_plat_info), GFP_KERNEL);
299
300
                dev_err(&pdev->dev, "%s: Unable to allocate 'p' for %s\n",
300
301
                        __func__, pdev->name);
301
302
                ret = -ENOMEM;
302
 
                goto exit_device_put;
 
303
                goto exit_device_del;
303
304
        }
304
305
 
305
306
        d = kzalloc(sizeof(struct omap_dma_dev_attr), GFP_KERNEL);
380
381
        kfree(d);
381
382
exit_release_p:
382
383
        kfree(p);
 
384
exit_device_del:
 
385
        platform_device_del(pdev);
383
386
exit_device_put:
384
387
        platform_device_put(pdev);
385
 
exit_device_del:
386
 
        platform_device_del(pdev);
387
388
 
388
389
        return ret;
389
390
}