diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-03 10:32:47 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-03 10:32:47 -0700 |
| commit | 43231b5be657fde1c4ced180d829bbd59ceef9ad (patch) | |
| tree | c20d5c79e63533abf71ab8f89598eb777e9bee2b /arch/arm/mach-ux500 | |
| parent | 105612489bf59386b46b3f9f034e03f70e57aee6 (diff) | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
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-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/cpu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index 537870d3fea..002da9a369d 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -140,14 +140,13 @@ struct device * __init ux500_soc_device_init(const char *soc_id) soc_info_populate(soc_dev_attr, soc_id); soc_dev = soc_device_register(soc_dev_attr); - if (IS_ERR_OR_NULL(soc_dev)) { + if (IS_ERR(soc_dev)) { kfree(soc_dev_attr); return NULL; } parent = soc_device_to_device(soc_dev); - if (!IS_ERR_OR_NULL(parent)) - device_create_file(parent, &ux500_soc_attr); + device_create_file(parent, &ux500_soc_attr); return parent; } |