diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2016-06-17 17:30:50 -0400 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-06-18 11:59:23 -0400 |
| commit | d6126a7032f4af5477dedf6ca9c6f1ee3498135a (patch) | |
| tree | b0cd427999ac40f2c6b1d542c3e5bc43d4b55c22 | |
| parent | 7c630ac4bf02eea4f0eb2aa266877b5d9c9d7efd (diff) | |
| download | linux-stable-d6126a7032f4af5477dedf6ca9c6f1ee3498135a.tar.gz linux-stable-d6126a7032f4af5477dedf6ca9c6f1ee3498135a.tar.bz2 linux-stable-d6126a7032f4af5477dedf6ca9c6f1ee3498135a.zip | |
of: fix autoloading due to broken modalias with no 'compatible'
[ Upstream commit b3c0a4dab7e35a9b6d69c0415641d2280fdefb2b ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -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 78691d51a479..0ef6956dcfa6 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -653,7 +653,7 @@ static int do_of_entry (const char *filename, void *symval, char *alias) 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); |