| Message ID | 20190712014554.62465-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] ASoC: audio-graph-card: Constify reg in graph_get_dai_id | expand |
Hi Nathan > clang errors: > > sound/soc/generic/audio-graph-card.c:87:7: error: assigning to 'u32 *' > (aka 'unsigned int *') from 'const void *' discards qualifiers > [-Werror,-Wincompatible-pointer-types-discards-qualifiers] > reg = of_get_property(node, "reg", NULL); > ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 1 error generated. > > Move the declaration up a bit to keep the reverse christmas tree look. > > Fixes: c152f8491a8d ("ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id()") > Link: https://github.com/ClangBuiltLinux/linux/issues/600 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > --- Maybe ec3042ad39d4e2ddbc3a3344f90bb10d8feb53bc ("ASoC: audio-graph-card: add missing const at graph_get_dai_id()") Thank you for your help !! Best regards --- Kuninori Morimoto
On Fri, Jul 12, 2019 at 12:37:51PM +0900, Kuninori Morimoto wrote: > > Hi Nathan > > > clang errors: > > > > sound/soc/generic/audio-graph-card.c:87:7: error: assigning to 'u32 *' > > (aka 'unsigned int *') from 'const void *' discards qualifiers > > [-Werror,-Wincompatible-pointer-types-discards-qualifiers] > > reg = of_get_property(node, "reg", NULL); > > ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > 1 error generated. > > > > Move the declaration up a bit to keep the reverse christmas tree look. > > > > Fixes: c152f8491a8d ("ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id()") > > Link: https://github.com/ClangBuiltLinux/linux/issues/600 > > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > > --- > > Maybe > > ec3042ad39d4e2ddbc3a3344f90bb10d8feb53bc > ("ASoC: audio-graph-card: add missing const at graph_get_dai_id()") > > Thank you for your help !! > Best regards > --- > Kuninori Morimoto Ugh, I even checked Mark's tree before sending this, just completely glossed over that patch. Sorry for the noise :( Cheers, Nathan
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index c8abb86afefa..c0d262a2ce2c 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -62,8 +62,8 @@ static int graph_get_dai_id(struct device_node *ep) struct device_node *node; struct device_node *endpoint; struct of_endpoint info; + const u32 *reg; int i, id; - u32 *reg; int ret; /* use driver specified DAI ID if exist */
clang errors: sound/soc/generic/audio-graph-card.c:87:7: error: assigning to 'u32 *' (aka 'unsigned int *') from 'const void *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] reg = of_get_property(node, "reg", NULL); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. Move the declaration up a bit to keep the reverse christmas tree look. Fixes: c152f8491a8d ("ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id()") Link: https://github.com/ClangBuiltLinux/linux/issues/600 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- v1 -> v2: * Update link in commit message (sorry, I create the commit message and send the patch first then create the issue and I forgot to check the closed ones for the correct number) sound/soc/generic/audio-graph-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)