diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/clocksource/clksrc-of.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'drivers/clocksource/clksrc-of.c')
| -rw-r--r-- | drivers/clocksource/clksrc-of.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c index 37f5325bec95..b9ddd9e3a2f5 100644 --- a/drivers/clocksource/clksrc-of.c +++ b/drivers/clocksource/clksrc-of.c | |||
| @@ -30,6 +30,9 @@ void __init clocksource_of_init(void) | |||
| 30 | clocksource_of_init_fn init_func; | 30 | clocksource_of_init_fn init_func; |
| 31 | 31 | ||
| 32 | for_each_matching_node_and_match(np, __clksrc_of_table, &match) { | 32 | for_each_matching_node_and_match(np, __clksrc_of_table, &match) { |
| 33 | if (!of_device_is_available(np)) | ||
| 34 | continue; | ||
| 35 | |||
| 33 | init_func = match->data; | 36 | init_func = match->data; |
| 34 | init_func(np); | 37 | init_func(np); |
| 35 | } | 38 | } |