diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:44 -0400 |
| commit | 88033d737d9f46e7eebda6a8f9770957eb9aae9c (patch) | |
| tree | 0b7c3bc6caa5ab4b7f8e88f05ce51ace87f25890 /drivers/timer | |
| parent | 9f0f432c0aea1e70959a0c06938459d3175a36b0 (diff) | |
| parent | 608e399fdef82e983db44c5cb8f5e772bba870e2 (diff) | |
| download | blackbird-obmc-uboot-88033d737d9f46e7eebda6a8f9770957eb9aae9c.tar.gz blackbird-obmc-uboot-88033d737d9f46e7eebda6a8f9770957eb9aae9c.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/timer')
| -rw-r--r-- | drivers/timer/timer-uclass.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index 382c0f2bd1..f8ddf93cf8 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -82,11 +82,9 @@ int notrace dm_timer_init(void) node = fdtdec_get_chosen_node(blob, "tick-timer"); if (node < 0) { /* No chosen timer, trying first available timer */ - ret = uclass_first_device(UCLASS_TIMER, &dev); + ret = uclass_first_device_err(UCLASS_TIMER, &dev); if (ret) return ret; - if (!dev) - return -ENODEV; } else { if (uclass_get_device_by_of_offset(UCLASS_TIMER, node, &dev)) { /* |
