]> git.karo-electronics.de Git - linux-beck.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)
commitf4833a519aec793cf8349bf479589d37473ef6a7
treedf7a1a364b6df7600ecb1d528dcea761e099107d
parent92e963f50fc74041b5e9e744c330dca48e04f08d
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