diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-30 18:11:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-30 18:11:18 +0100 |
| commit | f004eaf4d17d205842424a7e95dcff9a46fe3c5f (patch) | |
| tree | fbf213d7b933b4f58b031269a2a31b275c95be6c /arch/arm/mach-omap2/omap_device.c | |
| parent | abf92a3d2e868fef808d4a205371b7e5417dd0f7 (diff) | |
| parent | 937433c2502f663e5a0e8804462bc38c41b9021f (diff) | |
Merge remote-tracking branch 'regulator/topic/da9210' into regulator-devm
Diffstat (limited to 'arch/arm/mach-omap2/omap_device.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c index f99f68e1e85b..b69dd9abb50a 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c @@ -158,7 +158,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev) } od = omap_device_alloc(pdev, hwmods, oh_cnt); - if (!od) { + if (IS_ERR(od)) { dev_err(&pdev->dev, "Cannot allocate omap_device for :%s\n", oh_name); ret = PTR_ERR(od); |