Date: Tue, 30 Jan 2018 04:05:04 +0000 (UTC) From: Michal Meloun <mmel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328585 - head/sys/dev/extres/clk Message-ID: <201801300405.w0U4541W096583@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmel Date: Tue Jan 30 04:05:03 2018 New Revision: 328585 URL: https://svnweb.freebsd.org/changeset/base/328585 Log: Revert r328511, it was committed with <patch>.diff instead of <patch>.txt as commit log. Modified: head/sys/dev/extres/clk/clk.c Modified: head/sys/dev/extres/clk/clk.c ============================================================================== --- head/sys/dev/extres/clk/clk.c Tue Jan 30 03:31:40 2018 (r328584) +++ head/sys/dev/extres/clk/clk.c Tue Jan 30 04:05:03 2018 (r328585) @@ -642,11 +642,10 @@ clknode_adjust_parent(struct clknode *clknode, int idx if (clknode->parent_cnt == 0) return; if ((idx == CLKNODE_IDX_NONE) || (idx >= clknode->parent_cnt)) - panic("%s: Invalid parent index %d for clock %s", - __func__, idx, clknode->name); + panic("Invalid clock parent index\n"); if (clknode->parents[idx] == NULL) - panic("%s: Invalid parent index %d for clock %s", + panic("%s: Attempt to set invalid parent %d for clock %s", __func__, idx, clknode->name); /* Remove me from old children list. */ @@ -675,8 +674,8 @@ clknode_init_parent_idx(struct clknode *clknode, int i if ((idx == CLKNODE_IDX_NONE) || (idx >= clknode->parent_cnt) || (clknode->parent_names[idx] == NULL)) - panic("%s: Invalid parent index %d for clock %s", - __func__, idx, clknode->name); + panic("%s: Invalid clock parent index: %d\n", __func__, idx); + clknode->parent_idx = idx; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801300405.w0U4541W096583>