diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 21:31:29 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 21:31:29 +0100 |
commit | 33b9f582c5c1db515412cc7efff28f7d1779321f (patch) | |
tree | 60ea1b403b41f651bc570f4c368ba82064880796 /arch/arm/mach-integrator/integrator_ap.c | |
parent | 946342d03ec4e8367bba7bb99e7155e97f69058a (diff) | |
parent | 008ca431822f39a023322b3598d8366faf46cfc1 (diff) | |
download | linux-33b9f582c5c1db515412cc7efff28f7d1779321f.tar.gz linux-33b9f582c5c1db515412cc7efff28f7d1779321f.tar.bz2 linux-33b9f582c5c1db515412cc7efff28f7d1779321f.zip |
Merge branch 'cleanup' into for-linus
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
-rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index ea961445e0e9..b23c8e4f28e8 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -536,16 +536,14 @@ static void __init ap_init_of(void) 'A' + (ap_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, ap_sc_id); + integrator_init_sysfs(parent, ap_sc_id); of_platform_populate(root, of_default_bus_match_table, ap_auxdata_lookup, parent); |