Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: usb - turn off de-emphasis in s/pdif for cm6206
ALSA: asihpi: Use angle brackets for system includes
ALSA: fm801: add error handling if auto-detect fails
ALSA: hda - Check pin support EAPD in ad198x_power_eapd_write
ALSA: hda - Fix HP and Front pins of ad1988/ad1989 in ad198x_power_eapd()
ALSA: 6fire: Don't leak firmware in error path
ASoC: Fix wm_hubs input PGA ZC bits
ASoC: Fix dapm_is_shared_kcontrol so everything isn't shared
+30
-17
+1
-1
sound/pci/asihpi/hpidspcd.c
+1
-1
sound/pci/asihpi/hpidspcd.c
···
60
60
HPI_VER_MINOR(HPI_VER) * 100 + HPI_VER_RELEASE(HPI_VER)))
61
61
62
62
/***********************************************************************/
63
-
#include "linux/pci.h"
63
+
#include <linux/pci.h>
64
64
/*-------------------------------------------------------------------*/
65
65
short hpi_dsp_code_open(u32 adapter, struct dsp_code *ps_dsp_code,
66
66
u32 *pos_error_code)
+11
-2
sound/pci/fm801.c
+11
-2
sound/pci/fm801.c
···
1234
1234
sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
1235
1235
if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&
1236
1236
(tea575x_tuner & TUNER_TYPE_MASK) < 4) {
1237
-
if (snd_tea575x_init(&chip->tea))
1237
+
if (snd_tea575x_init(&chip->tea)) {
1238
1238
snd_printk(KERN_ERR "TEA575x radio not found\n");
1239
-
} else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0)
1239
+
snd_fm801_free(chip);
1240
+
return -ENODEV;
1241
+
}
1242
+
} else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0) {
1240
1243
/* autodetect tuner connection */
1241
1244
for (tea575x_tuner = 1; tea575x_tuner <= 3; tea575x_tuner++) {
1242
1245
chip->tea575x_tuner = tea575x_tuner;
···
1249
1246
break;
1250
1247
}
1251
1248
}
1249
+
if (tea575x_tuner == 4) {
1250
+
snd_printk(KERN_ERR "TEA575x radio not found\n");
1251
+
snd_fm801_free(chip);
1252
+
return -ENODEV;
1253
+
}
1254
+
}
1252
1255
strlcpy(chip->tea.card, snd_fm801_tea575x_gpios[(tea575x_tuner & TUNER_TYPE_MASK) - 1].name, sizeof(chip->tea.card));
1253
1256
#endif
1254
1257
+8
-8
sound/pci/hda/patch_analog.c
+8
-8
sound/pci/hda/patch_analog.c
···
506
506
hda_nid_t hp)
507
507
{
508
508
struct ad198x_spec *spec = codec->spec;
509
-
snd_hda_codec_write(codec, front, 0, AC_VERB_SET_EAPD_BTLENABLE,
509
+
if (snd_hda_query_pin_caps(codec, front) & AC_PINCAP_EAPD)
510
+
snd_hda_codec_write(codec, front, 0, AC_VERB_SET_EAPD_BTLENABLE,
510
511
!spec->inv_eapd ? 0x00 : 0x02);
511
-
snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_EAPD_BTLENABLE,
512
+
if (snd_hda_query_pin_caps(codec, hp) & AC_PINCAP_EAPD)
513
+
snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_EAPD_BTLENABLE,
512
514
!spec->inv_eapd ? 0x00 : 0x02);
513
515
}
514
516
···
526
524
case 0x11d4184a:
527
525
case 0x11d4194a:
528
526
case 0x11d4194b:
527
+
case 0x11d41988:
528
+
case 0x11d4198b:
529
+
case 0x11d4989a:
530
+
case 0x11d4989b:
529
531
ad198x_power_eapd_write(codec, 0x12, 0x11);
530
532
break;
531
533
case 0x11d41981:
···
538
532
break;
539
533
case 0x11d41986:
540
534
ad198x_power_eapd_write(codec, 0x1b, 0x1a);
541
-
break;
542
-
case 0x11d41988:
543
-
case 0x11d4198b:
544
-
case 0x11d4989a:
545
-
case 0x11d4989b:
546
-
ad198x_power_eapd_write(codec, 0x29, 0x22);
547
535
break;
548
536
}
549
537
}
+4
-4
sound/soc/codecs/wm_hubs.c
+4
-4
sound/soc/codecs/wm_hubs.c
···
215
215
SOC_SINGLE_TLV("IN1L Volume", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 0, 31, 0,
216
216
inpga_tlv),
217
217
SOC_SINGLE("IN1L Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 7, 1, 1),
218
-
SOC_SINGLE("IN1L ZC Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 7, 1, 0),
218
+
SOC_SINGLE("IN1L ZC Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 6, 1, 0),
219
219
220
220
SOC_SINGLE_TLV("IN1R Volume", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 0, 31, 0,
221
221
inpga_tlv),
222
222
SOC_SINGLE("IN1R Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 7, 1, 1),
223
-
SOC_SINGLE("IN1R ZC Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 7, 1, 0),
223
+
SOC_SINGLE("IN1R ZC Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 6, 1, 0),
224
224
225
225
226
226
SOC_SINGLE_TLV("IN2L Volume", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 0, 31, 0,
227
227
inpga_tlv),
228
228
SOC_SINGLE("IN2L Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 7, 1, 1),
229
-
SOC_SINGLE("IN2L ZC Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 7, 1, 0),
229
+
SOC_SINGLE("IN2L ZC Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 6, 1, 0),
230
230
231
231
SOC_SINGLE_TLV("IN2R Volume", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 0, 31, 0,
232
232
inpga_tlv),
233
233
SOC_SINGLE("IN2R Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 7, 1, 1),
234
-
SOC_SINGLE("IN2R ZC Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 7, 1, 0),
234
+
SOC_SINGLE("IN2R ZC Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 6, 1, 0),
235
235
236
236
SOC_SINGLE_TLV("MIXINL IN2L Volume", WM8993_INPUT_MIXER3, 7, 1, 0,
237
237
inmix_sw_tlv),
+4
-1
sound/soc/soc-dapm.c
+4
-1
sound/soc/soc-dapm.c
···
325
325
}
326
326
327
327
static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm,
328
+
struct snd_soc_dapm_widget *kcontrolw,
328
329
const struct snd_kcontrol_new *kcontrol_new,
329
330
struct snd_kcontrol **kcontrol)
330
331
{
···
335
334
*kcontrol = NULL;
336
335
337
336
list_for_each_entry(w, &dapm->card->widgets, list) {
337
+
if (w == kcontrolw || w->dapm != kcontrolw->dapm)
338
+
continue;
338
339
for (i = 0; i < w->num_kcontrols; i++) {
339
340
if (&w->kcontrol_news[i] == kcontrol_new) {
340
341
if (w->kcontrols)
···
471
468
return -EINVAL;
472
469
}
473
470
474
-
shared = dapm_is_shared_kcontrol(dapm, &w->kcontrol_news[0],
471
+
shared = dapm_is_shared_kcontrol(dapm, w, &w->kcontrol_news[0],
475
472
&kcontrol);
476
473
if (kcontrol) {
477
474
wlist = kcontrol->private_data;
+1
sound/usb/6fire/firmware.c
+1
sound/usb/6fire/firmware.c
+1
-1
sound/usb/quirks.c
+1
-1
sound/usb/quirks.c
···
403
403
static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
404
404
{
405
405
int err, reg;
406
-
int val[] = {0x200c, 0x3000, 0xf800, 0x143f, 0x0000, 0x3000};
406
+
int val[] = {0x2004, 0x3000, 0xf800, 0x143f, 0x0000, 0x3000};
407
407
408
408
for (reg = 0; reg < ARRAY_SIZE(val); reg++) {
409
409
err = snd_usb_cm106_write_int_reg(dev, reg, val[reg]);