]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: trace: fix printing jack name
authorArnd Bergmann <arnd@arndb.de>
Wed, 24 Feb 2016 16:38:14 +0000 (17:38 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 26 Feb 2016 01:52:48 +0000 (10:52 +0900)
commitf8aa7ad98f7d2aab7e04e6d050018485ec1cc843
treedf7a1a364b6df7600ecb1d528dcea761e099107d
parent5367e65a538f2d59834d845f582bc1f1ae9599b8
ASoC: trace: fix printing jack name

After a change to the snd_jack structure, the 'name' member
is no longer available in all configurations, which results in a
build failure in the tracing code:

include/trace/events/asoc.h: In function 'trace_event_raw_event_snd_soc_jack_report':
include/trace/events/asoc.h:240:32: error: 'struct snd_jack' has no member named 'name'

The name field is normally initialized from the card shortname and
the jack "id" field:

        snprintf(jack->name, sizeof(jack->name), "%s %s",
                 card->shortname, jack->id);

This changes the tracing output to just contain the 'id' by
itself, which slightly changes the output format but avoids the
link error and is hopefully still enough to see what is going on.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: fe0d128c57bf ("ALSA: jack: Allow building the jack layer without input device")
Signed-off-by: Mark Brown <broonie@kernel.org>
include/trace/events/asoc.h