diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-23 03:23:21 -0400 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-23 03:23:21 -0400 |
| commit | 28d4768869a297210bfd19d4a4b186acda0cdb1b (patch) | |
| tree | 5a2d844e03ae6fa35a8412c2d96852621fc01acf /drivers/clocksource | |
| parent | 814876b0b00ae98a8568d1b989bc98ca5389b98a (diff) | |
| parent | c54697ae180e652a96db8bc71f0c7c7baee2bf16 (diff) | |
Merge branch 'clockevents/cmt-mtu2-tmu-cleanups' into clockevents/3.16
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/sh_tmu.c | 2 |
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, | |||
| 498 | ch->base = tmu->mapbase + 8 + ch->index * 12; | 498 | ch->base = tmu->mapbase + 8 + ch->index * 12; |
| 499 | } | 499 | } |
| 500 | 500 | ||
| 501 | ch->irq = platform_get_irq(tmu->pdev, ch->index); | 501 | ch->irq = platform_get_irq(tmu->pdev, index); |
| 502 | if (ch->irq < 0) { | 502 | if (ch->irq < 0) { |
| 503 | dev_err(&tmu->pdev->dev, "ch%u: failed to get irq\n", | 503 | dev_err(&tmu->pdev->dev, "ch%u: failed to get irq\n", |
| 504 | ch->index); | 504 | ch->index); |