diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-09-08 14:05:16 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-09-08 14:05:16 +0200 |
commit | 950d8381d915ee293a5b57f91e59dd8115684af1 (patch) | |
tree | 6a611a808da1e28c3db740ac9a54c01757af2e56 /drivers/clocksource | |
parent | 979515c5645830465739254abc1b1648ada41518 (diff) | |
parent | d71f058617564750261b673ea9b3352382b9cde4 (diff) | |
download | linux-950d8381d915ee293a5b57f91e59dd8115684af1.tar.gz |
Merge branch 'linus' into timers/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r-- | drivers/clocksource/timer-atmel-pit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c index 3494bc5a21d5..7f0f5b26d8c5 100644 --- a/drivers/clocksource/timer-atmel-pit.c +++ b/drivers/clocksource/timer-atmel-pit.c @@ -240,6 +240,7 @@ static int __init at91sam926x_pit_common_init(struct pit_data *data) static int __init at91sam926x_pit_dt_init(struct device_node *node) { struct pit_data *data; + int ret; data = kzalloc(sizeof(*data), GFP_KERNEL); if (!data) |