Page MenuHomeFreeBSD

D61618.1794920504.diff
No OneTemporary

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D61618.1794920504.diff

diff --git a/sys/dev/clk/clk_fixed.c b/sys/dev/clk/clk_fixed.c
--- a/sys/dev/clk/clk_fixed.c
+++ b/sys/dev/clk/clk_fixed.c
@@ -289,7 +289,7 @@
if (rv != 0) {
/* No property exist */
device_printf(sc->dev, "Cannot get parent clock: %d\n", rv);
- panic("no clock"); /* XXX or return (CLK_FIXED_FAIL); */
+ return (CLK_FIXED_FAIL);
}
sc->def.clkdef.parent_names = malloc(sizeof(char *), M_OFWPROP,
@@ -430,7 +430,8 @@
if (rv == CLK_FIXED_FAIL)
goto fail;
- if ((sc->have_gpio && !sc->gpio_done) ||
+ if ((sc->have_clk && !sc->clk_done) ||
+ (sc->have_gpio && !sc->gpio_done) ||
(sc->have_reg && !sc->reg_done)) {
bus_generic_new_pass(dev);
return;
@@ -503,6 +504,15 @@
if (!sc->gpio_done || !sc->reg_done)
return (0);
}
+ if (sc->have_clk) {
+ rv = clk_fixed_get_clk(sc);
+ if (rv == CLK_FIXED_FAIL) {
+ rv = ENXIO;
+ goto fail;
+ }
+ if (rv == CLK_FIXED_NEW_PASS)
+ return (0);
+ }
sc->clkdom = clkdom_create(dev);
KASSERT(sc->clkdom != NULL, ("Clock domain is NULL"));

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 17, 1:01 PM (16 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41799988
Default Alt Text
D61618.1794920504.diff (1 KB)

Event Timeline