Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296199
b: refs/heads/master
c: 986c265
h: refs/heads/master
i:
  296197: 9deec39
  296195: 5dae5d5
  296191: 1f2fc87
v: v3
  • Loading branch information
Nicolas Ferre committed Mar 1, 2012
1 parent a059906 commit 6ae1dbf
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23fa648fd32658ca295de3ef2b7c883c7b8a6120
refs/heads/master: 986c265729cb798bb8414bd5d6c6006240a1011c
9 changes: 7 additions & 2 deletions trunk/arch/arm/mach-at91/at91sam926x_time.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,10 @@ static int __init of_at91sam926x_pit_init(void)

/* Get the interrupts property */
ret = irq_of_parse_and_map(np, 0);
if (!ret)
if (!ret) {
pr_crit("AT91: PIT: Unable to get IRQ from DT\n");
goto ioremap_err;
}
at91sam926x_pit_irq.irq = ret;

of_node_put(np);
Expand Down Expand Up @@ -203,6 +205,7 @@ static void __init at91sam926x_pit_init(void)
{
unsigned long pit_rate;
unsigned bits;
int ret;

/* For device tree enabled device: initialize here */
of_at91sam926x_pit_init();
Expand All @@ -227,7 +230,9 @@ static void __init at91sam926x_pit_init(void)
clocksource_register_hz(&pit_clk, pit_rate);

/* Set up irq handler */
setup_irq(at91sam926x_pit_irq.irq, &at91sam926x_pit_irq);
ret = setup_irq(at91sam926x_pit_irq.irq, &at91sam926x_pit_irq);
if (ret)
pr_crit("AT91: PIT: Unable to setup IRQ\n");

/* Set up and register clockevents */
pit_clkevt.mult = div_sc(pit_rate, NSEC_PER_SEC, pit_clkevt.shift);
Expand Down

0 comments on commit 6ae1dbf

Please sign in to comment.