diff options
| author |   kettenis <kettenis@openbsd.org> | 2016-08-22 22:06:59 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2016-08-22 22:06:59 +0000 |
| commit | 18bdb1170127a3959bacb2edb805f0433169de1f (patch) | |
| tree | 5564ae048f5a96211c74f4b284f5d0e8bed4e68e | |
| parent | Two minor fixes from dilyan palauzov. (diff) | |
| download | wireguard-openbsd-18bdb1170127a3959bacb2edb805f0433169de1f.tar.xz wireguard-openbsd-18bdb1170127a3959bacb2edb805f0433169de1f.zip | |
Fix two small bugs in the new reset API code.
| -rw-r--r-- | sys/dev/ofw/ofw_clock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/ofw/ofw_clock.c b/sys/dev/ofw/ofw_clock.c index 443b46795ba..34ed1342609 100644 --- a/sys/dev/ofw/ofw_clock.c +++ b/sys/dev/ofw/ofw_clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofw_clock.c,v 1.4 2016/08/22 19:28:27 kettenis Exp $ */ +/* $OpenBSD: ofw_clock.c,v 1.5 2016/08/22 22:06:59 kettenis Exp $ */ /* * Copyright (c) 2016 Mark Kettenis * @@ -326,7 +326,8 @@ reset_assert_cells(uint32_t *cells, int assert) break; } - rd->rd_reset(rd->rd_cookie, &cells[1], assert); + if (rd && rd->rd_reset) + rd->rd_reset(rd->rd_cookie, &cells[1], assert); } uint32_t * @@ -390,7 +391,7 @@ reset_do_assert_idx(int node, int idx, int assert) OF_getpropintarray(node, "resets", resets, len); reset = resets; - while (reset && resets < resets + (len / sizeof(uint32_t))) { + while (reset && reset < resets + (len / sizeof(uint32_t))) { if (idx <= 0) reset_assert_cells(reset, assert); if (idx == 0) |