D60202.id188326.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D60202.id188326.diff
View Options

	diff --git a/sys/arm/ti/ti_sysc.c b/sys/arm/ti/ti_sysc.c
	--- a/sys/arm/ti/ti_sysc.c
	+++ b/sys/arm/ti/ti_sysc.c
	@@ -306,12 +306,6 @@
	reg = malloc(nreg, M_DEVBUF, M_WAITOK);
	OF_getencprop(node, "reg", reg, nreg);

	- /* Make sure address & size are 0 */
	- for (idx = 0; idx < REG_MAX; idx++) {
	- sc->reg[idx].address = 0;
	- sc->reg[idx].size = 0;
	- }
	-
	/* Loop through reg-names and figure out which reg-name corresponds to
	* index populate the values into the reg array.
	*/
	@@ -473,11 +467,18 @@
	if (sb_sc->nranges == 0)
	return (ENXIO);

	- /* Required field reg & reg-names - assume at least "rev" exists */
	- err = parse_regfields(sc, sb_sc);
	- if (err) {
	- DPRINTF(sc->dev, "parse_regfields failed %d\n", err);
	- return (ENXIO);
	+ /* Make sure address & size are 0 */
	+ for (int idx = 0; idx < REG_MAX; idx++) {
	+ sc->reg[idx].address = 0;
	+ sc->reg[idx].size = 0;
	+ }
	+
	+ if (OF_hasprop(node, "reg") == 1) {
	+ err = parse_regfields(sc, sb_sc);
	+ if (err) {
	+ DPRINTF(sc->dev, "parse_regfields failed %d\n", err);
	+ return (ENXIO);
	+ }
	}

	/* Optional */