summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/sh_tmu.c
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2014-05-23 09:23:21 +0200
committerDaniel Lezcano <daniel.lezcano@linaro.org>2014-05-23 09:23:21 +0200
commit28d4768869a297210bfd19d4a4b186acda0cdb1b (patch)
tree5a2d844e03ae6fa35a8412c2d96852621fc01acf /drivers/clocksource/sh_tmu.c
parentclocksource: sh_tmu: Remove unnecessary OOM messages (diff)
parentclocksource: sh_tmu: Fix channel IRQ retrieval in legacy case (diff)
downloadlinux-28d4768869a297210bfd19d4a4b186acda0cdb1b.tar.xz
linux-28d4768869a297210bfd19d4a4b186acda0cdb1b.zip
Merge branch 'clockevents/cmt-mtu2-tmu-cleanups' into clockevents/3.16
Diffstat (limited to 'drivers/clocksource/sh_tmu.c')
-rw-r--r--drivers/clocksource/sh_tmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index a38022fa286f..6bd17a8f3dd4 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -498,7 +498,7 @@ static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index,
ch->base = tmu->mapbase + 8 + ch->index * 12;
}
- ch->irq = platform_get_irq(tmu->pdev, ch->index);
+ ch->irq = platform_get_irq(tmu->pdev, index);
if (ch->irq < 0) {
dev_err(&tmu->pdev->dev, "ch%u: failed to get irq\n",
ch->index);