summaryrefslogtreecommitdiff
path: root/arch/arm/mach-integrator/integrator_cp.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-04-03 21:32:47 +0400
committerTony Lindgren <tony@atomide.com>2013-04-03 21:32:47 +0400
commit43231b5be657fde1c4ced180d829bbd59ceef9ad (patch)
treec20d5c79e63533abf71ab8f89598eb777e9bee2b /arch/arm/mach-integrator/integrator_cp.c
parent105612489bf59386b46b3f9f034e03f70e57aee6 (diff)
parent71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff)
downloadlinux-43231b5be657fde1c4ced180d829bbd59ceef9ad.tar.xz
Merge commit '7185684' into omap-for-v3.10/timer
Conflicts: arch/arm/plat-omap/dmtimer.c Resolve merge conflict in omap_device.c as per Lothar Waßmann <LW@KARO-electronics.de>.
Diffstat (limited to 'arch/arm/mach-integrator/integrator_cp.c')
-rw-r--r--arch/arm/mach-integrator/integrator_cp.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 2b0db82a5381..da1091be0887 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -360,17 +360,14 @@ static void __init intcp_init_of(void)
'A' + (intcp_sc_id & 0x0f));
soc_dev = soc_device_register(soc_dev_attr);
- if (IS_ERR_OR_NULL(soc_dev)) {
+ if (IS_ERR(soc_dev)) {
kfree(soc_dev_attr->revision);
kfree(soc_dev_attr);
return;
}
parent = soc_device_to_device(soc_dev);
-
- if (!IS_ERR_OR_NULL(parent))
- integrator_init_sysfs(parent, intcp_sc_id);
-
+ integrator_init_sysfs(parent, intcp_sc_id);
of_platform_populate(root, of_default_bus_match_table,
intcp_auxdata_lookup, parent);
}