Skip to contentSkip to conversation

OMAP4: fix return value of omap4_l3_init

PATCH New Rabin Vincent 2 participants 3 messages May 7, 2011 – May 31, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Rabin Vincent

author
#0 lore raw

PATCH 1/1 OMAP4: fix return value of omap4_l3_init

Don't PTR_ERR() a non-error pointer:

initcall omap4_l3_init+0x0/0xdc returned -544980480 after 0 usecs initcall omap4_l3_init+0x0/0xdc returned with error code -544980480

Signed-off-by Rabin Vincent <[email protected]>
---
 arch/arm/mach-omap2/devices.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/devices.c +1 -1
index 7b85585..5b8ca68 100644
@@ -97,7 +97,7 @@ static int __init omap4_l3_init(void)
 
 	WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name);
 
-	return PTR_ERR(od);
+	return IS_ERR(od) ? PTR_ERR(od) : 0;
 }
 postcore_initcall(omap4_l3_init);
Signature · 1 line
1.7.4.1
author
#1 lore raw

PATCH 1/1 OMAP4: fix return value of omap4_l3_init

Quoted 6 lines · Rabin Vincent

Don't PTR_ERR() a non-error pointer:

?initcall omap4_l3_init+0x0/0xdc returned -544980480 after 0 usecs ?initcall omap4_l3_init+0x0/0xdc returned with error code -544980480

Signed-off-by Rabin Vincent <[email protected]>

Ping?

(with some git blame'd people now on cc.)

Quoted 21 lines

---
?arch/arm/mach-omap2/devices.c | ? ?2 +-
?1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mach-omap2/devices.c +1 -2
index 7b85585..5b8ca68 100644
@@ -97,7 +97,7 @@ static int __init omap4_l3_init(void)
 
 ? ? ? ?WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name);
 
- ? ? ? return PTR_ERR(od);
+ ? ? ? return IS_ERR(od) ? PTR_ERR(od) : 0;
 ?}
 ?postcore_initcall(omap4_l3_init);
 
--

1.7.4.1

maintainer
#2 lore raw

PATCH 1/1 OMAP4: fix return value of omap4_l3_init

In reply to Rabin Vincent
Quoted 4 lines · Rabin Vincent

Don't PTR_ERR() a non-error pointer:

initcall omap4_l3_init+0x0/0xdc returned -544980480 after 0 usecs initcall omap4_l3_init+0x0/0xdc returned with error code -544980480

Adding to fixes thanks.

Tony

Quoted 21 lines
Signed-off-by Rabin Vincent <[email protected]>
---
 arch/arm/mach-omap2/devices.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/devices.c +1 -1
index 7b85585..5b8ca68 100644
@@ -97,7 +97,7 @@ static int __init omap4_l3_init(void)
 
 	WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name);
 
-	return PTR_ERR(od);
+	return IS_ERR(od) ? PTR_ERR(od) : 0;
 }
 postcore_initcall(omap4_l3_init);
Signature · 1 line
1.7.4.1