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: hda - Fix no NID error with VIA codecs ALSA: isight: adjust for new queueing API ALSA: 6fire - Fix signedness bug ALSA: lola - Fix section mismatch ALSA: hda - Fix missing static inline to beep dummy function ALSA: 6fire: Fix double-free bug in usb6fire_fw_ezusb_upload() ALSA: hda - Fix beep_device compilation warnings ALSA: hda - Fix wrong auto-mute type for Acer Aspire-one ALSA: emu10k1: Add details for E-mu 0404 PCIe version ALSA: hdspm - Add firmware revision ID for RME MADI PCI version ALSA: hdspm - Fix jumping external wordclock frequency in AutoSync mode ALSA: hdspm - Fix locking in snd_hdspm_midi_input_read
This commit is contained in:
commit
95d17b7168
|
@ -209,6 +209,7 @@ static void isight_packet(struct fw_iso_context *context, u32 cycle,
|
||||||
isight->packet_index = -1;
|
isight->packet_index = -1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
fw_iso_context_queue_flush(isight->context);
|
||||||
|
|
||||||
if (++index >= QUEUE_LENGTH)
|
if (++index >= QUEUE_LENGTH)
|
||||||
index = 0;
|
index = 0;
|
||||||
|
|
|
@ -1440,6 +1440,14 @@ static struct snd_emu_chip_details emu_chip_details[] = {
|
||||||
.ca0102_chip = 1,
|
.ca0102_chip = 1,
|
||||||
.spk71 = 1,
|
.spk71 = 1,
|
||||||
.emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
|
.emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
|
||||||
|
/* EMU0404 PCIe */
|
||||||
|
{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40051102,
|
||||||
|
.driver = "Audigy2", .name = "E-mu 0404 PCIe [MAEM8984]",
|
||||||
|
.id = "EMU0404",
|
||||||
|
.emu10k2_chip = 1,
|
||||||
|
.ca0108_chip = 1,
|
||||||
|
.spk71 = 1,
|
||||||
|
.emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 PCIe ver_03 */
|
||||||
/* Note that all E-mu cards require kernel 2.6 or newer. */
|
/* Note that all E-mu cards require kernel 2.6 or newer. */
|
||||||
{.vendor = 0x1102, .device = 0x0008,
|
{.vendor = 0x1102, .device = 0x0008,
|
||||||
.driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",
|
.driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",
|
||||||
|
|
|
@ -50,7 +50,12 @@ int snd_hda_enable_beep_device(struct hda_codec *codec, int enable);
|
||||||
int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);
|
int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);
|
||||||
void snd_hda_detach_beep_device(struct hda_codec *codec);
|
void snd_hda_detach_beep_device(struct hda_codec *codec);
|
||||||
#else
|
#else
|
||||||
#define snd_hda_attach_beep_device(...) 0
|
static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
|
||||||
#define snd_hda_detach_beep_device(...)
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
static inline void snd_hda_detach_beep_device(struct hda_codec *codec)
|
||||||
|
{
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -13316,9 +13316,8 @@ static void alc268_acer_lc_setup(struct hda_codec *codec)
|
||||||
struct alc_spec *spec = codec->spec;
|
struct alc_spec *spec = codec->spec;
|
||||||
spec->autocfg.hp_pins[0] = 0x15;
|
spec->autocfg.hp_pins[0] = 0x15;
|
||||||
spec->autocfg.speaker_pins[0] = 0x14;
|
spec->autocfg.speaker_pins[0] = 0x14;
|
||||||
spec->automute_mixer_nid[0] = 0x0f;
|
|
||||||
spec->automute = 1;
|
spec->automute = 1;
|
||||||
spec->automute_mode = ALC_AUTOMUTE_MIXER;
|
spec->automute_mode = ALC_AUTOMUTE_AMP;
|
||||||
spec->ext_mic.pin = 0x18;
|
spec->ext_mic.pin = 0x18;
|
||||||
spec->ext_mic.mux_idx = 0;
|
spec->ext_mic.mux_idx = 0;
|
||||||
spec->int_mic.pin = 0x12;
|
spec->int_mic.pin = 0x12;
|
||||||
|
|
|
@ -832,10 +832,13 @@ static int via_hp_build(struct hda_codec *codec)
|
||||||
knew->subdevice = HDA_SUBDEV_NID_FLAG | nid;
|
knew->subdevice = HDA_SUBDEV_NID_FLAG | nid;
|
||||||
knew->private_value = nid;
|
knew->private_value = nid;
|
||||||
|
|
||||||
|
nid = side_mute_channel(spec);
|
||||||
|
if (nid) {
|
||||||
knew = via_clone_control(spec, &via_hp_mixer[1]);
|
knew = via_clone_control(spec, &via_hp_mixer[1]);
|
||||||
if (knew == NULL)
|
if (knew == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
knew->subdevice = side_mute_channel(spec);
|
knew->subdevice = nid;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -445,7 +445,7 @@ static void lola_reset_setups(struct lola *chip)
|
||||||
lola_setup_all_analog_gains(chip, PLAY, false); /* output, update */
|
lola_setup_all_analog_gains(chip, PLAY, false); /* output, update */
|
||||||
}
|
}
|
||||||
|
|
||||||
static int lola_parse_tree(struct lola *chip)
|
static int __devinit lola_parse_tree(struct lola *chip)
|
||||||
{
|
{
|
||||||
unsigned int val;
|
unsigned int val;
|
||||||
int nid, err;
|
int nid, err;
|
||||||
|
|
|
@ -521,6 +521,7 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
|
||||||
#define HDSPM_DMA_AREA_KILOBYTES (HDSPM_DMA_AREA_BYTES/1024)
|
#define HDSPM_DMA_AREA_KILOBYTES (HDSPM_DMA_AREA_BYTES/1024)
|
||||||
|
|
||||||
/* revisions >= 230 indicate AES32 card */
|
/* revisions >= 230 indicate AES32 card */
|
||||||
|
#define HDSPM_MADI_OLD_REV 207
|
||||||
#define HDSPM_MADI_REV 210
|
#define HDSPM_MADI_REV 210
|
||||||
#define HDSPM_RAYDAT_REV 211
|
#define HDSPM_RAYDAT_REV 211
|
||||||
#define HDSPM_AIO_REV 212
|
#define HDSPM_AIO_REV 212
|
||||||
|
@ -1143,7 +1144,7 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
|
||||||
|
|
||||||
/* if wordclock has synced freq and wordclock is valid */
|
/* if wordclock has synced freq and wordclock is valid */
|
||||||
if ((status2 & HDSPM_wcLock) != 0 &&
|
if ((status2 & HDSPM_wcLock) != 0 &&
|
||||||
(status & HDSPM_SelSyncRef0) == 0) {
|
(status2 & HDSPM_SelSyncRef0) == 0) {
|
||||||
|
|
||||||
rate_bits = status2 & HDSPM_wcFreqMask;
|
rate_bits = status2 & HDSPM_wcFreqMask;
|
||||||
|
|
||||||
|
@ -1639,12 +1640,14 @@ static int snd_hdspm_midi_input_read (struct hdspm_midi *hmidi)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
hmidi->pending = 0;
|
hmidi->pending = 0;
|
||||||
|
spin_unlock_irqrestore(&hmidi->lock, flags);
|
||||||
|
|
||||||
|
spin_lock_irqsave(&hmidi->hdspm->lock, flags);
|
||||||
hmidi->hdspm->control_register |= hmidi->ie;
|
hmidi->hdspm->control_register |= hmidi->ie;
|
||||||
hdspm_write(hmidi->hdspm, HDSPM_controlRegister,
|
hdspm_write(hmidi->hdspm, HDSPM_controlRegister,
|
||||||
hmidi->hdspm->control_register);
|
hmidi->hdspm->control_register);
|
||||||
|
spin_unlock_irqrestore(&hmidi->hdspm->lock, flags);
|
||||||
|
|
||||||
spin_unlock_irqrestore (&hmidi->lock, flags);
|
|
||||||
return snd_hdspm_midi_output_write (hmidi);
|
return snd_hdspm_midi_output_write (hmidi);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6377,6 +6380,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
|
||||||
|
|
||||||
switch (hdspm->firmware_rev) {
|
switch (hdspm->firmware_rev) {
|
||||||
case HDSPM_MADI_REV:
|
case HDSPM_MADI_REV:
|
||||||
|
case HDSPM_MADI_OLD_REV:
|
||||||
hdspm->io_type = MADI;
|
hdspm->io_type = MADI;
|
||||||
hdspm->card_name = "RME MADI";
|
hdspm->card_name = "RME MADI";
|
||||||
hdspm->midiPorts = 3;
|
hdspm->midiPorts = 3;
|
||||||
|
|
|
@ -270,7 +270,6 @@ static int usb6fire_fw_ezusb_upload(
|
||||||
data = 0x00; /* resume ezusb cpu */
|
data = 0x00; /* resume ezusb cpu */
|
||||||
ret = usb6fire_fw_ezusb_write(device, 0xa0, 0xe600, &data, 1);
|
ret = usb6fire_fw_ezusb_write(device, 0xa0, 0xe600, &data, 1);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
release_firmware(fw);
|
|
||||||
snd_printk(KERN_ERR PREFIX "unable to upload ezusb "
|
snd_printk(KERN_ERR PREFIX "unable to upload ezusb "
|
||||||
"firmware %s: end message.\n", fwname);
|
"firmware %s: end message.\n", fwname);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -395,12 +395,12 @@ static int usb6fire_pcm_open(struct snd_pcm_substream *alsa_sub)
|
||||||
alsa_rt->hw = pcm_hw;
|
alsa_rt->hw = pcm_hw;
|
||||||
|
|
||||||
if (alsa_sub->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
if (alsa_sub->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
||||||
if (rt->rate >= 0)
|
if (rt->rate < ARRAY_SIZE(rates))
|
||||||
alsa_rt->hw.rates = rates_alsaid[rt->rate];
|
alsa_rt->hw.rates = rates_alsaid[rt->rate];
|
||||||
alsa_rt->hw.channels_max = OUT_N_CHANNELS;
|
alsa_rt->hw.channels_max = OUT_N_CHANNELS;
|
||||||
sub = &rt->playback;
|
sub = &rt->playback;
|
||||||
} else if (alsa_sub->stream == SNDRV_PCM_STREAM_CAPTURE) {
|
} else if (alsa_sub->stream == SNDRV_PCM_STREAM_CAPTURE) {
|
||||||
if (rt->rate >= 0)
|
if (rt->rate < ARRAY_SIZE(rates))
|
||||||
alsa_rt->hw.rates = rates_alsaid[rt->rate];
|
alsa_rt->hw.rates = rates_alsaid[rt->rate];
|
||||||
alsa_rt->hw.channels_max = IN_N_CHANNELS;
|
alsa_rt->hw.channels_max = IN_N_CHANNELS;
|
||||||
sub = &rt->capture;
|
sub = &rt->capture;
|
||||||
|
|
Loading…
Reference in New Issue