August 2015 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Segmentation Fault in snd_pcm_rate_hw_free()
by Valentin Corfu 05 Aug '15

05 Aug '15

Hello ALSA developers, I observed one segmentation fault in snd_pcm_rate_hw_free() function, with the following BT: (gdb) up #1 0xb7554cc1 in raise (sig=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 64 return INLINE_SYSCALL (tgkill, 3, pid, selftid, sig); (gdb) #2 0xb75580ee in abort () at abort.c:92 92 raise (SIGABRT); (gdb) #3 0xb758a7dd in __libc_message (do_abort=2, fmt=0xb766053c "*** glibc detected *** %s: %s: 0x%s ***\n") at ../sysdeps/unix/sysv/linux/libc_fatal.c:189 189 abort (); (gdb) #4 0xb7594a71 in malloc_printerr (action=<value optimized out>, str=<value optimized out>, ptr=0x969ae98) at malloc.c:6283 6283 __libc_message (action & 2, (gdb) #5 0xb759636b in _int_free (av=<value optimized out>, p=0x969ae90) at malloc.c:4795 4795 malloc_printerr (check_action, errstr, chunk2mem(p)); (gdb) #6 0xb75994bd in __libc_free (mem=0x969ae98) at malloc.c:3738 3738 _int_free(ar_ptr, p); (gdb) #7 0xb76f3a81 in snd_pcm_rate_hw_free (pcm=0x9685d78) at pcm_rate.c:341 341 free(rate->pareas[0].addr); (gdb) #8 0xb76d045b in snd_pcm_hw_free (pcm=0x9685d78) at pcm.c:858 858 err = pcm->ops->hw_free(pcm->op_arg); (gdb) #9 0xb76f826e in snd_pcm_plug_hw_free (pcm=0x96856b0) at pcm_plug.c:1046 1046 int err = snd_pcm_hw_free(slave); (gdb) #10 0xb76d045b in snd_pcm_hw_free (pcm=0x96856b0) at pcm.c:858 858 err = pcm->ops->hw_free(pcm->op_arg); (gdb) #11 0x080492ad in main () Could you please give me some hints how to solve this issue? I can provide you more info or the test application, if needed. I can see the issue every time, and I also checked with latest version of alsa-lib but I got the same results. Thank you, Valentin Corfu

2 6

[alsa-devel] [PATCH] topology: Add support for writing manifest private data.
by Liam Girdwood 05 Aug '15

05 Aug '15

From: Mengdong Lin <mengdong.lin(a)intel.com> Allow manifest to contain private data and write this data to file. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/topology/builder.c | 37 ++++++++++++++++++++++++++++++++----- src/topology/tplg_local.h | 1 + 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/topology/builder.c b/src/topology/builder.c index 0066b22..a944866 100644 --- a/src/topology/builder.c +++ b/src/topology/builder.c @@ -226,9 +226,6 @@ static int write_block(snd_tplg_t *tplg, struct list_head *base, case OBJECT_TYPE_CC: return write_elem_block(tplg, base, size, SND_SOC_TPLG_TYPE_DAI_LINK, "cc"); - case OBJECT_TYPE_MANIFEST: - return write_data_block(tplg, size, SND_SOC_TPLG_TYPE_MANIFEST, - "manifest", &tplg->manifest); case OBJECT_TYPE_DATA: return write_elem_block(tplg, base, size, SND_SOC_TPLG_TYPE_PDATA, "data"); @@ -239,13 +236,43 @@ static int write_block(snd_tplg_t *tplg, struct list_head *base, return 0; } +/* write the manifest including its private data */ +static int write_manifest_data(snd_tplg_t *tplg) +{ + int ret; + + /* write the header for this block */ + ret = write_block_header(tplg, SND_SOC_TPLG_TYPE_MANIFEST, 0, + SND_SOC_TPLG_ABI_VERSION, 0, + sizeof(tplg->manifest) + tplg->manifest.priv.size, 1); + if (ret < 0) { + SNDERR("error: failed to write manifest block %d\n", ret); + return ret; + } + + verbose(tplg, "manifest : write %d bytes\n", sizeof(tplg->manifest)); + ret = write(tplg->out_fd, &tplg->manifest, sizeof(tplg->manifest)); + if (ret < 0) { + SNDERR("error: failed to write manifest %d\n", ret); + return ret; + } + + verbose(tplg, "manifest : write %d priv bytes\n", tplg->manifest.priv.size); + ret = write(tplg->out_fd, tplg->manifest_pdata, tplg->manifest.priv.size); + if (ret < 0) { + SNDERR("error: failed to write manifest priv data %d\n", ret); + return ret; + } + + return 0; +} + int tplg_write_data(snd_tplg_t *tplg) { int ret; /* write manifest */ - ret = write_data_block(tplg, sizeof(tplg->manifest), - OBJECT_TYPE_MANIFEST, "manifest", &tplg->manifest); + ret = write_manifest_data(tplg); if (ret < 0) { SNDERR("failed to write manifest %d\n", ret); return ret; diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h index 62788e4..ad38945 100644 --- a/src/topology/tplg_local.h +++ b/src/topology/tplg_local.h @@ -77,6 +77,7 @@ struct snd_tplg { /* manifest */ struct snd_soc_tplg_manifest manifest; + const void *manifest_pdata; /* copied by builder at file write */ /* list of each element type */ struct list_head tlv_list; -- 2.1.4

2 1

[alsa-devel] [PATCH] topology: Add element ID so we can look up references by name.
by Liam Girdwood 05 Aug '15

05 Aug '15

From: Jin Yao <yao.jin(a)linux.intel.com> Add support to lookup elements by name. This is in preparation for adding some new API calls that will allow building topology data using a C API. This will allow applications to build thier own topology data directly. Signed-off-by: Jin Yao <yao.jin(a)linux.intel.com> Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> --- src/topology/ctl.c | 9 ++++----- src/topology/dapm.c | 2 +- src/topology/data.c | 2 +- src/topology/elem.c | 15 +++++++++++---- src/topology/pcm.c | 10 +++++----- src/topology/text.c | 2 +- src/topology/tplg_local.h | 2 +- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/topology/ctl.c b/src/topology/ctl.c index 9c1333c..aa06ff6 100644 --- a/src/topology/ctl.c +++ b/src/topology/ctl.c @@ -264,7 +264,7 @@ int tplg_parse_tlv(snd_tplg_t *tplg, snd_config_t *cfg, int err = 0; struct tplg_elem *elem; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_TLV); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_TLV); if (!elem) return -ENOMEM; @@ -298,7 +298,7 @@ int tplg_parse_control_bytes(snd_tplg_t *tplg, const char *id, *val = NULL; int err; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_BYTES); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_BYTES); if (!elem) return -ENOMEM; @@ -403,11 +403,10 @@ int tplg_parse_control_enum(snd_tplg_t *tplg, snd_config_t *cfg, const char *id, *val = NULL; int err, j; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_ENUM); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_ENUM); if (!elem) return -ENOMEM; - /* init new mixer */ ec = elem->enum_ctrl; elem_copy_text(ec->hdr.name, elem->id, SNDRV_CTL_ELEM_ID_NAME_MAXLEN); ec->hdr.type = SND_SOC_TPLG_TYPE_ENUM; @@ -501,7 +500,7 @@ int tplg_parse_control_mixer(snd_tplg_t *tplg, const char *id, *val = NULL; int err, j; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_MIXER); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_MIXER); if (!elem) return -ENOMEM; diff --git a/src/topology/dapm.c b/src/topology/dapm.c index 1da82ad..7e26ea0 100644 --- a/src/topology/dapm.c +++ b/src/topology/dapm.c @@ -420,7 +420,7 @@ int tplg_parse_dapm_widget(snd_tplg_t *tplg, const char *id, *val = NULL; int widget_type, err; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_DAPM_WIDGET); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_DAPM_WIDGET); if (!elem) return -ENOMEM; diff --git a/src/topology/data.c b/src/topology/data.c index 13e1e2b..c768bc5 100644 --- a/src/topology/data.c +++ b/src/topology/data.c @@ -268,7 +268,7 @@ int tplg_parse_data(snd_tplg_t *tplg, snd_config_t *cfg, int err = 0; struct tplg_elem *elem; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_DATA); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_DATA); if (!elem) return -ENOMEM; diff --git a/src/topology/elem.c b/src/topology/elem.c index d7a1fd7..7fee653 100644 --- a/src/topology/elem.c +++ b/src/topology/elem.c @@ -103,20 +103,27 @@ struct tplg_elem *tplg_elem_lookup(struct list_head *base, const char* id, /* create a new common element and object */ struct tplg_elem* tplg_elem_new_common(snd_tplg_t *tplg, - snd_config_t *cfg, enum object_type type) + snd_config_t *cfg, const char *name, enum object_type type) { struct tplg_elem *elem; const char *id; int obj_size = 0; void *obj; + if (!cfg && !name) + return NULL; + elem = tplg_elem_new(); if (!elem) return NULL; - snd_config_get_id(cfg, &id); - strncpy(elem->id, id, SNDRV_CTL_ELEM_ID_NAME_MAXLEN); - elem->id[SNDRV_CTL_ELEM_ID_NAME_MAXLEN - 1] = 0; + /* do we get name from cfg */ + if (cfg) { + snd_config_get_id(cfg, &id); + elem_copy_text(elem->id, id, SNDRV_CTL_ELEM_ID_NAME_MAXLEN); + elem->id[SNDRV_CTL_ELEM_ID_NAME_MAXLEN - 1] = 0; + } else if (name != NULL) + elem_copy_text(elem->id, name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN); switch (type) { case OBJECT_TYPE_DATA: diff --git a/src/topology/pcm.c b/src/topology/pcm.c index 8f23a6f..deae47b 100644 --- a/src/topology/pcm.c +++ b/src/topology/pcm.c @@ -228,7 +228,7 @@ int tplg_parse_pcm_config(snd_tplg_t *tplg, const char *id; int err; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_STREAM_CONFIG); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_STREAM_CONFIG); if (!elem) return -ENOMEM; @@ -294,7 +294,7 @@ int tplg_parse_pcm_caps(snd_tplg_t *tplg, char *s; int err; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_STREAM_CAPS); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_STREAM_CAPS); if (!elem) return -ENOMEM; @@ -461,7 +461,7 @@ int tplg_parse_pcm(snd_tplg_t *tplg, const char *id, *val = NULL; int err; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_PCM); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_PCM); if (!elem) return -ENOMEM; @@ -524,7 +524,7 @@ int tplg_parse_be(snd_tplg_t *tplg, const char *id, *val = NULL; int err; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_BE); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_BE); if (!elem) return -ENOMEM; @@ -587,7 +587,7 @@ int tplg_parse_cc(snd_tplg_t *tplg, const char *id, *val = NULL; int err; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_CC); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_CC); if (!elem) return -ENOMEM; diff --git a/src/topology/text.c b/src/topology/text.c index ebb6e38..7128056 100644 --- a/src/topology/text.c +++ b/src/topology/text.c @@ -64,7 +64,7 @@ int tplg_parse_text(snd_tplg_t *tplg, snd_config_t *cfg, int err = 0; struct tplg_elem *elem; - elem = tplg_elem_new_common(tplg, cfg, OBJECT_TYPE_TEXT); + elem = tplg_elem_new_common(tplg, cfg, NULL, OBJECT_TYPE_TEXT); if (!elem) return -ENOMEM; diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h index 688c78f..62788e4 100644 --- a/src/topology/tplg_local.h +++ b/src/topology/tplg_local.h @@ -216,7 +216,7 @@ struct tplg_elem *tplg_elem_lookup(struct list_head *base, const char* id, unsigned int type); struct tplg_elem* tplg_elem_new_common(snd_tplg_t *tplg, - snd_config_t *cfg, enum object_type type); + snd_config_t *cfg, const char *name, enum object_type type); static inline void elem_copy_text(char *dest, const char *src, int len) { -- 2.1.4

2 1

[alsa-devel] [PATCH] topology: fix element object type is switch()
by Liam Girdwood 05 Aug '15

05 Aug '15

Use the correct type for this object. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/topology/elem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/topology/elem.c b/src/topology/elem.c index 32ba2c1..d7a1fd7 100644 --- a/src/topology/elem.c +++ b/src/topology/elem.c @@ -137,7 +137,7 @@ struct tplg_elem* tplg_elem_new_common(snd_tplg_t *tplg, list_add_tail(&elem->list, &tplg->enum_list); obj_size = sizeof(struct snd_soc_tplg_enum_control); break; - case SND_SOC_TPLG_TYPE_MIXER: + case OBJECT_TYPE_MIXER: list_add_tail(&elem->list, &tplg->mixer_list); obj_size = sizeof(struct snd_soc_tplg_mixer_control); break; -- 2.1.4

2 1

[alsa-devel] [PATCH] ALSA: hda - Fix Dell laptop for internal mic/headset mic
by woodrow.shen＠canonical.com 05 Aug '15

05 Aug '15

From: Woodrow Shen <woodrow.shen(a)canonical.com> The new Dell laptop with ALC3266 can't use internal microphone to record. Also, the 3 ring headset mic doesn't work on it. For src of patch_realtek.c, only the pin cfg of Nid 0x17 is different, so the Nid 0x17 is added into pin quirk, and others are defined to macro ALC298_STANDARD_PINS in common use. Codec: Realtek ALC3266 Vendor Id: 0x10ec0298 Subsystem Id: 0x102806e5 BugLink: https://bugs.launchpad.net/bugs/1481575 Signed-off-by: Woodrow Shen <woodrow.shen(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b20f104..294ba67 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5401,6 +5401,10 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {0x14, 0x90170110}, \ {0x15, 0x0221401f} +#define ALC298_STANDARD_PINS \ + {0x12, 0x90a60130}, \ + {0x21, 0x03211020} + static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE, {0x14, 0x90170110}, @@ -5570,9 +5574,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ALC292_STANDARD_PINS, {0x13, 0x90a60140}), SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE, - {0x12, 0x90a60130}, - {0x17, 0x90170140}, - {0x21, 0x03211020}), + ALC298_STANDARD_PINS, + {0x17, 0x90170140}), + SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE, + ALC298_STANDARD_PINS, + {0x17, 0x90170110}), {} }; -- 2.1.4

2 1

Re: [alsa-devel] When select 2.1 profile in pulseaudio, how do pulseaudio select notebook 's internal subwoofer or 5.1 external speaker ?
by Raymond Yau 05 Aug '15

05 Aug '15

> > > > Do pulseaudio 2.1 profile select the internal subwoofer or your 5.1 > > external speaker ? > > My external speaker (i.e not subwoofer but center). It always was so. > https://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/commit/sound/p… +/* default channel maps for 2.1 speakers; + * since HD-audio supports only stereo, odd number channels are omitted + */ +const struct snd_pcm_chmap_elem snd_pcm_2_1_chmaps[] = { + { .channels = 2, + .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } }, + { .channels = 4, + .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR, + SNDRV_CHMAP_LFE, SNDRV_CHMAP_LFE } }, + { } +}; The default 2.1 channel map for internal subwoofer does not has 5.1 channel map But your notebook have three jacks at ext front which support 5.1 In your case,there is no default 2.1 channel map when the current model has three speaker pins after remove the not exist internal surround speakers, [ALC882_FIXUP_ACER_ASPIRE_4930G] = { - .type = HDA_FIXUP_PINS, - .v.pins = (const struct hda_pintbl[]) { - { 0x16, 0x99130111 }, /* CLFE speaker */ - { 0x17, 0x99130112 }, /* surround speaker */ - { } - }, you need to use the left channel version of 2.1 channel and 5.1 channel map +static const struct snd_pcm_chmap_elem acer_pcm_chmaps[] = { + { .channels = 2, + .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } }, + { .channels = 4, + .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR, + SNDRV_CHMAP_LFE, SNDRV_CHMAP_NA } }, /* LFE only on left */ + { .channels = 4, + .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR, + SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } }, + { .channels = 6, + .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR, + SNDRV_CHMAP_RL, SNDRV_CHMAP_RR, + SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE } }, + { } +}; http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=48f1b308cc66152e… <http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=48f1b308cc66152e…> conf: Allow 2.1 surround to use different number of channels This way, cards that support LFE on four channels (e g laptop with internal subwoofer) can do that, and other cards on a six channel setup can use that as well. which channel map is used by alsa lib when you open surround21 pcm device since your notebook will have both channel maps ?

1 1

[alsa-devel] [RFC][PATCH 0/2] ALSA: fireworks/firewire-lib: add support for recent firmware quirk
by Takashi Sakamoto 05 Aug '15

05 Aug '15

Some users have reported current ALSA Fireworks driver stops packet streaming due to detecting discontinuity. [alsa-devel] ALSA snd-fireworks Echo AudioFire 2 http://mailman.alsa-project.org/pipermail/alsa-devel/2014-August/080379.html [alsa-devel] AudioFire4 quirk http://mailman.alsa-project.org/pipermail/alsa-devel/2015-July/095697.html As long as I investigate, this issue depends on firmware version installed in these devices. While, it's not clear that which version of firmwares for which model has this quirk. At least, firmware version 5.7.0, 5.7.3 and 5.8.0 for AudioFire2/AudioFire4/AudioFirePre8 have this quirk. This patchset applies a solution for this issue, with my assumption that 'the same firmware binary has the same quirk'. These models, AudioFire8 (since Jul 2009) and Gibson Robot Interface Pack (RIP) series uses the same firmware binary in driver package. Takashi Sakamoto (2): Revert "ALSA: fireworks: add support for AudioFire2 quirk" ALSA: fireworks/firewire-lib: add support for recent firmware quirk sound/firewire/amdtp.c | 5 +++-- sound/firewire/amdtp.h | 2 ++ sound/firewire/fireworks/fireworks.c | 10 ++++++++-- sound/firewire/fireworks/fireworks.h | 2 +- sound/firewire/fireworks/fireworks_stream.c | 12 +++++++++--- 5 files changed, 23 insertions(+), 8 deletions(-) -- 2.1.4

2 5

Re: [alsa-devel] ASoC: dapm: Simplify list creation in dapm_dai_get_connected_widgets()
by Dan Carpenter 04 Aug '15

04 Aug '15

Hello Lars-Peter Clausen, The patch 1ce43acff0c0: "ASoC: dapm: Simplify list creation in dapm_dai_get_connected_widgets()" from Jul 26, 2015, leads to the following static checker warning: sound/soc/soc-dapm.c:1199 snd_soc_dapm_dai_get_connected_widgets() warn: inconsistent returns 'mutex:&card->dapm_mutex'. Locked on: line 1194 Unlocked on: line 1199 sound/soc/soc-dapm.c 1164 int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream, 1165 struct snd_soc_dapm_widget_list **list) 1166 { 1167 struct snd_soc_card *card = dai->component->card; 1168 struct snd_soc_dapm_widget *w; 1169 LIST_HEAD(widgets); 1170 int paths; 1171 int ret; 1172 1173 mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); 1174 1175 /* 1176 * For is_connected_{output,input}_ep fully discover the graph we need 1177 * to reset the cached number of inputs and outputs. 1178 */ 1179 list_for_each_entry(w, &card->widgets, list) { 1180 w->inputs = -1; 1181 w->outputs = -1; 1182 } 1183 1184 if (stream == SNDRV_PCM_STREAM_PLAYBACK) 1185 paths = is_connected_output_ep(dai->playback_widget, &widgets); 1186 else 1187 paths = is_connected_input_ep(dai->capture_widget, &widgets); 1188 1189 /* Drop starting point */ 1190 list_del(widgets.next); 1191 1192 ret = dapm_widget_list_create(list, &widgets); 1193 if (ret) 1194 return ret; ^^^^^^^^^^^ Holding card->dapm_mutex. 1195 1196 trace_snd_soc_dapm_connected(paths, stream); 1197 mutex_unlock(&card->dapm_mutex); 1198 1199 return paths; 1200 } regards, dan carpenter

2 1

[alsa-devel] [TRIVIAL PATCH V2] ASoC: atmel_ssc_dai: Correct misuse of 0x%<decimal>
by Joe Perches 04 Aug '15

04 Aug '15

Correct misuse of 0x%d in logging message. Signed-off-by: Joe Perches <joe(a)perches.com> --- Resend with later, non-broken version of Evolution email client (3.16 -> 3.16.3) sound/soc/atmel/atmel_ssc_dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 841d059..ba8def5 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -290,7 +290,7 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, int dir, dir_mask; int ret; - pr_debug("atmel_ssc_startup: SSC_SR=0x%u\n", + pr_debug("atmel_ssc_startup: SSC_SR=0x%x\n", ssc_readl(ssc_p->ssc->regs, SR)); /* Enable PMC peripheral clock for this SSC */

2 1

[alsa-devel] [PATCH] ASoC: topology: fix typo in soc_tplg_kcontrol_bind_io()
by Liam Girdwood 04 Aug '15

04 Aug '15

From: Mengdong Lin <mengdong.lin(a)intel.com> Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index df3ddf0..4dadb5e 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -534,7 +534,7 @@ static int soc_tplg_kcontrol_bind_io(struct snd_soc_tplg_ctl_hdr *hdr, k->put = bops[i].put; if (k->get == NULL && bops[i].id == hdr->ops.get) k->get = bops[i].get; - if (k->info == NULL && ops[i].id == hdr->ops.info) + if (k->info == NULL && bops[i].id == hdr->ops.info) k->info = bops[i].info; } -- 2.1.4

2 1