Merge branch 'next'

[oweals/u-boot.git] / drivers / timer / timer-uclass.c

diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 382c0f2bd15dbb961a764a2be2c4f50256973ff8..f8ddf93cf8157fcf2a2de60fcab046914829d66e 100644 (file)
--- 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)) {
                        /*