History

Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull more sound fixes from Takashi Iwai: "The fixes for random bugs that have been reported lately in the game: a few fixes in ASoC dpam and wm_hubs bugs spotted by Coverity, a one-liner HD-audio fixup, and a fix for Oops with DPCM. They are not so critically urgent bugs, but all small and safe" * tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: fix oops in snd_pcm_info() caused by ASoC DPCM ASoC: wm_hubs: Add missing break in hp_supply_event() ALSA: hda - Add a fixup for ASUS N76VZ ASoC: dapm: Return -ENOMEM in snd_soc_dapm_new_dai_widgets() ASoC: dapm: Fix source list debugfs outputs

Linus Torvalds committed 13 years ago

Commit f9adfbf2 parents 68e952d a4461f44 files · +9 −1Browse files

Unified · Split

4 files
  1. sound/core/pcm.c +4 −0
  2. sound/pci/hda/patch_realtek.c +1 −0
  3. sound/soc/codecs/wm_hubs.c +1 −0
  4. sound/soc/soc-dapm.c +3 −1
sound/core/pcm.c+4−0
@@ -49,6 +49,8 @@ static struct snd_pcm *snd_pcm_get(struct snd_card *card, int device) · 48 unmodified lines
49 struct snd_pcm *pcm;49 struct snd_pcm *pcm;
50 50
51 list_for_each_entry(pcm, &snd_pcm_devices, list) {51 list_for_each_entry(pcm, &snd_pcm_devices, list) {
52 if (pcm->internal)
53 continue;
52 if (pcm->card == card && pcm->device == device)54 if (pcm->card == card && pcm->device == device)
53 return pcm;55 return pcm;
54 }56 }
@@ -60,6 +62,8 @@ static int snd_pcm_next(struct snd_card *card, int device) · 5 unmodified lines
60 struct snd_pcm *pcm;62 struct snd_pcm *pcm;
61 63
62 list_for_each_entry(pcm, &snd_pcm_devices, list) {64 list_for_each_entry(pcm, &snd_pcm_devices, list) {
65 if (pcm->internal)
66 continue;
63 if (pcm->card == card && pcm->device > device)67 if (pcm->card == card && pcm->device > device)
64 return pcm->device;68 return pcm->device;
65 else if (pcm->card->number > card->number)69 else if (pcm->card->number > card->number)
sound/pci/hda/patch_realtek.c+1−0
@@ -4623,6 +4623,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { · 4622 unmodified lines
4623 SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),4623 SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
4624 SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),4624 SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
4625 SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4),4625 SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4),
4626 SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_ASUS_MODE4),
4626 SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),4627 SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
4627 SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),4628 SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),
4628 SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),4629 SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),
sound/soc/codecs/wm_hubs.c+1−0
@@ -530,6 +530,7 @@ static int hp_supply_event(struct snd_soc_dapm_widget *w, · 529 unmodified lines
530 hubs->hp_startup_mode);530 hubs->hp_startup_mode);
531 break;531 break;
532 }532 }
533 break;
533 534
534 case SND_SOC_DAPM_PRE_PMD:535 case SND_SOC_DAPM_PRE_PMD:
535 snd_soc_update_bits(codec, WM8993_CHARGE_PUMP_1,536 snd_soc_update_bits(codec, WM8993_CHARGE_PUMP_1,
sound/soc/soc-dapm.c+3−1
@@ -1949,7 +1949,7 @@ static ssize_t dapm_widget_power_read_file(struct file *file, · 1948 unmodified lines
1949 w->active ? "active" : "inactive");1949 w->active ? "active" : "inactive");
1950 1950
1951 list_for_each_entry(p, &w->sources, list_sink) {1951 list_for_each_entry(p, &w->sources, list_sink) {
1952 if (p->connected && !p->connected(w, p->sink))1952 if (p->connected && !p->connected(w, p->source))
1953 continue;1953 continue;
1954 1954
1955 if (p->connect)1955 if (p->connect)
@@ -3495,6 +3495,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, · 1539 unmodified lines
3495 if (!w) {3495 if (!w) {
3496 dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",3496 dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",
3497 dai->driver->playback.stream_name);3497 dai->driver->playback.stream_name);
3498 return -ENOMEM;
3498 }3499 }
3499 3500
3500 w->priv = dai;3501 w->priv = dai;
@@ -3513,6 +3514,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, · 12 unmodified lines
3513 if (!w) {3514 if (!w) {
3514 dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",3515 dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",
3515 dai->driver->capture.stream_name);3516 dai->driver->capture.stream_name);
3517 return -ENOMEM;
3516 }3518 }
3517 3519
3518 w->priv = dai;3520 w->priv = dai;