diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-01 08:27:55 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-01 08:27:55 +1000 |
| commit | 35a8524ffe84667e805b9249316e729e050c83b2 (patch) | |
| tree | b995e1adde02732f9d462a2097a09b7cddac7bf7 /arch/arm/mach-omap2/dma.c | |
| parent | ffbbf2da9e578dc7b7ae4f945412c4b74f54b20e (diff) | |
| parent | 0e6d8cad448bde3d846961bb43db15daae94562e (diff) | |
| download | op-kernel-dev-35a8524ffe84667e805b9249316e729e050c83b2.zip op-kernel-dev-35a8524ffe84667e805b9249316e729e050c83b2.tar.gz | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR
arm: omap2: mux: fix compile warning
omap1: Simplify use of omap_irq_flags
omap2+: Fix unused variable warning for omap_irq_base
Diffstat (limited to 'arch/arm/mach-omap2/dma.c')
| -rw-r--r-- | arch/arm/mach-omap2/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c index d2f15f5..34922b2 100644 --- a/arch/arm/mach-omap2/dma.c +++ b/arch/arm/mach-omap2/dma.c @@ -264,7 +264,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) if (IS_ERR(od)) { pr_err("%s: Cant build omap_device for %s:%s.\n", __func__, name, oh->name); - return IS_ERR(od); + return PTR_ERR(od); } mem = platform_get_resource(&od->pdev, IORESOURCE_MEM, 0); |
