Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"It was a fairly calm week; here you can find only a few trivial quirks
and fixes for USB and HD-audio. All changes are pretty device
specific"
* tag 'sound-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb-audio: fix missing input volume controls in MAYA44 USB(+)
ALSA: usb-audio: add MAYA44 USB+ mixer control names
ALSA: hda/realtek - Add a fixup for another Acer Aspire 9420
ALSA: hda - Fix jack detection at resume with VT codecs
ALSA: usb-audio: don't try to get Outlaw RR2150 sample rate
ALSA: usb-audio: Add mic volume fix quirk for Logitech Quickcam Fusion
ALSA: hda/realtek - Suooprt Dell headset mode for ALC256
+28
-6
+8
sound/pci/hda/patch_realtek.c
+8
sound/pci/hda/patch_realtek.c
···
2168
2168
static const struct snd_pci_quirk alc882_fixup_tbl[] = {
2169
2169
SND_PCI_QUIRK(0x1025, 0x006c, "Acer Aspire 9810", ALC883_FIXUP_ACER_EAPD),
2170
2170
SND_PCI_QUIRK(0x1025, 0x0090, "Acer Aspire", ALC883_FIXUP_ACER_EAPD),
2171
+
SND_PCI_QUIRK(0x1025, 0x0107, "Acer Aspire", ALC883_FIXUP_ACER_EAPD),
2171
2172
SND_PCI_QUIRK(0x1025, 0x010a, "Acer Ferrari 5000", ALC883_FIXUP_ACER_EAPD),
2172
2173
SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_FIXUP_ACER_EAPD),
2173
2174
SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_FIXUP_ACER_EAPD),
···
5377
5376
{0x17, 0x40000000},
5378
5377
{0x1d, 0x40700001},
5379
5378
{0x21, 0x02211040}),
5379
+
SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5380
+
ALC255_STANDARD_PINS,
5381
+
{0x12, 0x90a60160},
5382
+
{0x14, 0x90170120},
5383
+
{0x17, 0x40000000},
5384
+
{0x1d, 0x40700001},
5385
+
{0x21, 0x02211030}),
5380
5386
SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5381
5387
ALC256_STANDARD_PINS,
5382
5388
{0x13, 0x40000000}),
+10
sound/pci/hda/patch_via.c
+10
sound/pci/hda/patch_via.c
···
449
449
450
450
return 0;
451
451
}
452
+
453
+
static int via_resume(struct hda_codec *codec)
454
+
{
455
+
/* some delay here to make jack detection working (bko#98921) */
456
+
msleep(10);
457
+
codec->patch_ops.init(codec);
458
+
regcache_sync(codec->core.regmap);
459
+
return 0;
460
+
}
452
461
#endif
453
462
454
463
#ifdef CONFIG_PM
···
484
475
.stream_pm = snd_hda_gen_stream_pm,
485
476
#ifdef CONFIG_PM
486
477
.suspend = via_suspend,
478
+
.resume = via_resume,
487
479
.check_power_status = via_check_power_status,
488
480
#endif
489
481
};
+4
-6
sound/usb/mixer.c
+4
-6
sound/usb/mixer.c
···
918
918
case USB_ID(0x046d, 0x081d): /* HD Webcam c510 */
919
919
case USB_ID(0x046d, 0x0825): /* HD Webcam c270 */
920
920
case USB_ID(0x046d, 0x0826): /* HD Webcam c525 */
921
+
case USB_ID(0x046d, 0x08ca): /* Logitech Quickcam Fusion */
921
922
case USB_ID(0x046d, 0x0991):
922
923
/* Most audio usb devices lie about volume resolution.
923
924
* Most Logitech webcams have res = 384.
···
1583
1582
unitid);
1584
1583
return -EINVAL;
1585
1584
}
1586
-
/* no bmControls field (e.g. Maya44) -> ignore */
1587
-
if (desc->bLength <= 10 + input_pins) {
1588
-
usb_audio_dbg(state->chip, "MU %d has no bmControls field\n",
1589
-
unitid);
1590
-
return 0;
1591
-
}
1592
1585
1593
1586
num_ins = 0;
1594
1587
ich = 0;
1595
1588
for (pin = 0; pin < input_pins; pin++) {
1596
1589
err = parse_audio_unit(state, desc->baSourceID[pin]);
1597
1590
if (err < 0)
1591
+
continue;
1592
+
/* no bmControls field (e.g. Maya44) -> ignore */
1593
+
if (desc->bLength <= 10 + input_pins)
1598
1594
continue;
1599
1595
err = check_input_term(state, desc->baSourceID[pin], &iterm);
1600
1596
if (err < 0)
+5
sound/usb/mixer_maps.c
+5
sound/usb/mixer_maps.c
+1
sound/usb/quirks.c
+1
sound/usb/quirks.c
···
1120
1120
case USB_ID(0x045E, 0x0772): /* MS Lifecam Studio */
1121
1121
case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */
1122
1122
case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
1123
+
case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */
1123
1124
return true;
1124
1125
}
1125
1126
return false;