summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/timer.c
diff options
context:
space:
mode:
authorTony Lindgren2015-07-24 06:14:02 +0200
committerTony Lindgren2015-07-24 06:14:02 +0200
commit97d9a3d0967f711e271ef950f1745307720c95d5 (patch)
tree0fe61791923a06a61e2512feb49b30504550b32c /arch/arm/mach-omap2/timer.c
parentARM: OMAP2+: Remove module references from IOMMU machine layer (diff)
parentMerge branch 'prcm-a-for-v4.3' into hwmod-prcm-for-v4.3 (diff)
downloadkernel-qcow2-linux-97d9a3d0967f711e271ef950f1745307720c95d5.tar.gz
kernel-qcow2-linux-97d9a3d0967f711e271ef950f1745307720c95d5.tar.xz
kernel-qcow2-linux-97d9a3d0967f711e271ef950f1745307720c95d5.zip
Merge tag 'for-v4.3/omap-hwmod-prcm-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.3/soc
ARM: OMAP2+: PRCM and hwmod changes for v4.3 This series adds: - I/O wakeup support for AM43xx - register lock and unlock support to the hwmod code (needed for the RTC IP blocks on some chips) - several fixes for sparse warnings and an unnecessary null pointer test - a DRA7xx clockdomain configuration workaround, to deal with some hardware bugs Basic build, boot, and PM tests are here: http://www.pwsan.com/omap/testlogs/hwmod-prcm-for-v4.3/20150723080012/ Since I do not have an AM43xx or DRA7xx device, I can't test on those platforms.
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r--arch/arm/mach-omap2/timer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index c52051b6742c..f44bcab3f52f 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -208,8 +208,7 @@ static void __init omap_dmtimer_init(void)
/* If we are a secure device, remove any secure timer nodes */
if ((omap_type() != OMAP2_DEVICE_TYPE_GP)) {
np = omap_get_timer_dt(omap_timer_match, "ti,timer-secure");
- if (np)
- of_node_put(np);
+ of_node_put(np);
}
}