diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-09 00:57:41 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-09 00:57:41 +0200 |
| commit | fce680e9faaa8acc0ab0a931c5fa823b581cbab0 (patch) | |
| tree | c96026ec637128c21c665a733db5594ebebbb5a4 /arch/arm/mach-omap2/board-omap3beagle.c | |
| parent | Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm... (diff) | |
| parent | ARM: OMAP: SmartReflex: fix error path in init function (diff) | |
| download | linux-fce680e9faaa8acc0ab0a931c5fa823b581cbab0.tar.xz linux-fce680e9faaa8acc0ab0a931c5fa823b581cbab0.zip | |
Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm
OMAP PM related fixes for v3.7-rc
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 68ff8d51973c..79d4820b291b 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -461,7 +461,7 @@ static void __init beagle_opp_init(void) mpu_dev = omap_device_get_by_hwmod_name("mpu"); iva_dev = omap_device_get_by_hwmod_name("iva"); - if (!mpu_dev || !iva_dev) { + if (IS_ERR(mpu_dev) || IS_ERR(iva_dev)) { pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n", __func__, mpu_dev, iva_dev); return; |