Merge branch 'clockevents/cmt-mtu2-tmu-cleanups' into clockevents/3.16

This commit is contained in:
Daniel Lezcano 2014-05-23 09:23:21 +02:00
commit 28d4768869

View File

@ -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->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) { if (ch->irq < 0) {
dev_err(&tmu->pdev->dev, "ch%u: failed to get irq\n", dev_err(&tmu->pdev->dev, "ch%u: failed to get irq\n",
ch->index); ch->index);