mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 22:51:35 +00:00
Merge branch 'clockevents/cmt-mtu2-tmu-cleanups' into clockevents/3.16
This commit is contained in:
commit
28d4768869
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user