* [BUGFIX PATCH] ARM: OMAP: fix type of return values in omap_device_get_by_hwmod_name()
@ 2013-03-21 12:13 Lothar Waßmann
2013-03-22 16:36 ` Russell King - ARM Linux
0 siblings, 1 reply; 2+ messages in thread
From: Lothar Waßmann @ 2013-03-21 12:13 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-omap, linux-kernel, Tony Lindgren, Russell King,
Lothar Waßmann
The merge bda5e141fbe96295c669692114d18687730269fb erroneously changed
the return value of some error exits of omap_device_get_by_hwmod_name()
from ERR_PTR() to -ENODEV.
This fixes the warnings:
arch/arm/mach-omap2/omap_device.c: In function 'omap_device_get_by_hwmod_name':
arch/arm/mach-omap2/omap_device.c:821:3: warning: return makes pointer from integer without a cast
arch/arm/mach-omap2/omap_device.c:826:3: warning: return makes pointer from integer without a cast
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---
arch/arm/mach-omap2/omap_device.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index 2448c7a..eeea4fa 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -818,12 +818,12 @@ struct device *omap_device_get_by_hwmod_name(const char *oh_name)
if (!oh) {
WARN(1, "%s: no hwmod for %s\n", __func__,
oh_name);
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
}
if (!oh->od) {
WARN(1, "%s: no omap_device for %s\n", __func__,
oh_name);
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
}
return &oh->od->pdev->dev;
--
1.7.2.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [BUGFIX PATCH] ARM: OMAP: fix type of return values in omap_device_get_by_hwmod_name()
2013-03-21 12:13 [BUGFIX PATCH] ARM: OMAP: fix type of return values in omap_device_get_by_hwmod_name() Lothar Waßmann
@ 2013-03-22 16:36 ` Russell King - ARM Linux
0 siblings, 0 replies; 2+ messages in thread
From: Russell King - ARM Linux @ 2013-03-22 16:36 UTC (permalink / raw)
To: Lothar Waßmann
Cc: linux-arm-kernel, Tony Lindgren, linux-omap, linux-kernel
On Thu, Mar 21, 2013 at 01:13:10PM +0100, Lothar Waßmann wrote:
> The merge bda5e141fbe96295c669692114d18687730269fb erroneously changed
Don't forget that commit's description as well...
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-22 16:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-21 12:13 [BUGFIX PATCH] ARM: OMAP: fix type of return values in omap_device_get_by_hwmod_name() Lothar Waßmann
2013-03-22 16:36 ` Russell King - ARM Linux
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®