diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2016-06-06 18:48:38 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-06-08 10:40:20 +1000 |
| commit | b3c0a4dab7e35a9b6d69c0415641d2280fdefb2b (patch) | |
| tree | 5eb0148634c528f17c016e3c26bfc4cc0a1a5f10 | |
| parent | 2c2a63e301fd19ccae673e79de59b30a232ff7f9 (diff) | |
| download | linux-b3c0a4dab7e35a9b6d69c0415641d2280fdefb2b.tar.gz linux-b3c0a4dab7e35a9b6d69c0415641d2280fdefb2b.tar.bz2 linux-b3c0a4dab7e35a9b6d69c0415641d2280fdefb2b.zip | |
of: fix autoloading due to broken modalias with no 'compatible'
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: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Tested-by: Mathieu Malaterre <malat@debian.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Andreas Schwab <schwab@linux-m68k.org>
Fixes: 6543becf26fff6 ("mod/file2alias: make modalias generation safe for cross compiling")
Cc: stable@vger.kernel.org # v3.9+
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | scripts/mod/file2alias.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index a9155077feef..fec75786f75b 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -384,7 +384,7 @@ static void do_of_entry_multi(void *symval, struct module *mod) len = sprintf(alias, "of:N%sT%s", (*name)[0] ? *name : "*", (*type)[0] ? *type : "*"); - if (compatible[0]) + if ((*compatible)[0]) sprintf(&alias[len], "%sC%s", (*type)[0] ? "*" : "", *compatible); |