Commit 6d58954b authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman

of: fix autoloading due to broken modalias with no 'compatible'

commit b3c0a4da upstream.

Because of an improper dereference, a stray 'C' character was output to
the modalias when no 'compatible' was specified. This is the case for
some old PowerMac drivers which only set the 'name' property. Fix it to
let them match again.
Reported-by: default avatarMathieu Malaterre <malat@debian.org>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Tested-by: default avatarMathieu Malaterre <malat@debian.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Andreas Schwab <schwab@linux-m68k.org>
Fixes: 6543becf ("mod/file2alias: make modalias generation safe for cross compiling")
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a400a793
...@@ -695,7 +695,7 @@ static int do_of_entry (const char *filename, void *symval, char *alias) ...@@ -695,7 +695,7 @@ static int do_of_entry (const char *filename, void *symval, char *alias)
len = sprintf(alias, "of:N%sT%s", (*name)[0] ? *name : "*", len = sprintf(alias, "of:N%sT%s", (*name)[0] ? *name : "*",
(*type)[0] ? *type : "*"); (*type)[0] ? *type : "*");
if (compatible[0]) if ((*compatible)[0])
sprintf(&alias[len], "%sC%s", (*type)[0] ? "*" : "", sprintf(&alias[len], "%sC%s", (*type)[0] ? "*" : "",
*compatible); *compatible);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment