Skip to content

Commit 95d17b7

Browse files
torvaldstorvalds
committed
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
2 parents 01eff85 + ad24094 commit 95d17b7

File tree

9 files changed

+33
-14
lines changed

9 files changed

+33
-14
lines changed

‎sound/firewire/isight.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ static void isight_packet(struct fw_iso_context *context, u32 cycle,
209209
isight->packet_index = -1;
210210
return;
211211
}
212+
fw_iso_context_queue_flush(isight->context);
212213

213214
if (++index >= QUEUE_LENGTH)
214215
index = 0;

‎sound/pci/emu10k1/emu10k1_main.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,6 +1440,14 @@ static struct snd_emu_chip_details emu_chip_details[] = {
14401440
.ca0102_chip = 1,
14411441
.spk71 = 1,
14421442
.emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
1443+
/* EMU0404 PCIe */
1444+
{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40051102,
1445+
.driver = "Audigy2", .name = "E-mu 0404 PCIe [MAEM8984]",
1446+
.id = "EMU0404",
1447+
.emu10k2_chip = 1,
1448+
.ca0108_chip = 1,
1449+
.spk71 = 1,
1450+
.emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 PCIe ver_03 */
14431451
/* Note that all E-mu cards require kernel 2.6 or newer. */
14441452
{.vendor = 0x1102, .device = 0x0008,
14451453
.driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",

‎sound/pci/hda/hda_beep.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@ int snd_hda_enable_beep_device(struct hda_codec *codec, int enable);
5050
int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);
5151
void snd_hda_detach_beep_device(struct hda_codec *codec);
5252
#else
53-
#define snd_hda_attach_beep_device(...) 0
54-
#define snd_hda_detach_beep_device(...)
53+
static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
54+
{
55+
return 0;
56+
}
57+
static inline void snd_hda_detach_beep_device(struct hda_codec *codec)
58+
{
59+
}
5560
#endif
5661
#endif

‎sound/pci/hda/patch_realtek.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13316,9 +13316,8 @@ static void alc268_acer_lc_setup(struct hda_codec *codec)
1331613316
struct alc_spec *spec = codec->spec;
1331713317
spec->autocfg.hp_pins[0] = 0x15;
1331813318
spec->autocfg.speaker_pins[0] = 0x14;
13319-
spec->automute_mixer_nid[0] = 0x0f;
1332013319
spec->automute = 1;
13321-
spec->automute_mode = ALC_AUTOMUTE_MIXER;
13320+
spec->automute_mode = ALC_AUTOMUTE_AMP;
1332213321
spec->ext_mic.pin = 0x18;
1332313322
spec->ext_mic.mux_idx = 0;
1332413323
spec->int_mic.pin = 0x12;

‎sound/pci/hda/patch_via.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -832,10 +832,13 @@ static int via_hp_build(struct hda_codec *codec)
832832
knew->subdevice = HDA_SUBDEV_NID_FLAG | nid;
833833
knew->private_value = nid;
834834

835-
knew = via_clone_control(spec, &via_hp_mixer[1]);
836-
if (knew == NULL)
837-
return -ENOMEM;
838-
knew->subdevice = side_mute_channel(spec);
835+
nid = side_mute_channel(spec);
836+
if (nid) {
837+
knew = via_clone_control(spec, &via_hp_mixer[1]);
838+
if (knew == NULL)
839+
return -ENOMEM;
840+
knew->subdevice = nid;
841+
}
839842

840843
return 0;
841844
}

‎sound/pci/lola/lola.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ static void lola_reset_setups(struct lola *chip)
445445
lola_setup_all_analog_gains(chip, PLAY, false); /* output, update */
446446
}
447447

448-
static int lola_parse_tree(struct lola *chip)
448+
static int __devinit lola_parse_tree(struct lola *chip)
449449
{
450450
unsigned int val;
451451
int nid, err;

‎sound/pci/rme9652/hdspm.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
521521
#define HDSPM_DMA_AREA_KILOBYTES (HDSPM_DMA_AREA_BYTES/1024)
522522

523523
/* revisions >= 230 indicate AES32 card */
524+
#define HDSPM_MADI_OLD_REV 207
524525
#define HDSPM_MADI_REV 210
525526
#define HDSPM_RAYDAT_REV 211
526527
#define HDSPM_AIO_REV 212
@@ -1143,7 +1144,7 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
11431144

11441145
/* if wordclock has synced freq and wordclock is valid */
11451146
if ((status2 & HDSPM_wcLock) != 0 &&
1146-
(status & HDSPM_SelSyncRef0) == 0) {
1147+
(status2 & HDSPM_SelSyncRef0) == 0) {
11471148

11481149
rate_bits = status2 & HDSPM_wcFreqMask;
11491150

@@ -1639,12 +1640,14 @@ static int snd_hdspm_midi_input_read (struct hdspm_midi *hmidi)
16391640
}
16401641
}
16411642
hmidi->pending = 0;
1643+
spin_unlock_irqrestore(&hmidi->lock, flags);
16421644

1645+
spin_lock_irqsave(&hmidi->hdspm->lock, flags);
16431646
hmidi->hdspm->control_register |= hmidi->ie;
16441647
hdspm_write(hmidi->hdspm, HDSPM_controlRegister,
16451648
hmidi->hdspm->control_register);
1649+
spin_unlock_irqrestore(&hmidi->hdspm->lock, flags);
16461650

1647-
spin_unlock_irqrestore (&hmidi->lock, flags);
16481651
return snd_hdspm_midi_output_write (hmidi);
16491652
}
16501653

@@ -6377,6 +6380,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
63776380

63786381
switch (hdspm->firmware_rev) {
63796382
case HDSPM_MADI_REV:
6383+
case HDSPM_MADI_OLD_REV:
63806384
hdspm->io_type = MADI;
63816385
hdspm->card_name = "RME MADI";
63826386
hdspm->midiPorts = 3;

‎sound/usb/6fire/firmware.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ static int usb6fire_fw_ezusb_upload(
270270
data = 0x00; /* resume ezusb cpu */
271271
ret = usb6fire_fw_ezusb_write(device, 0xa0, 0xe600, &data, 1);
272272
if (ret < 0) {
273-
release_firmware(fw);
274273
snd_printk(KERN_ERR PREFIX "unable to upload ezusb "
275274
"firmware %s: end message.\n", fwname);
276275
return ret;

‎sound/usb/6fire/pcm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,12 +395,12 @@ static int usb6fire_pcm_open(struct snd_pcm_substream *alsa_sub)
395395
alsa_rt->hw = pcm_hw;
396396

397397
if (alsa_sub->stream == SNDRV_PCM_STREAM_PLAYBACK) {
398-
if (rt->rate >= 0)
398+
if (rt->rate < ARRAY_SIZE(rates))
399399
alsa_rt->hw.rates = rates_alsaid[rt->rate];
400400
alsa_rt->hw.channels_max = OUT_N_CHANNELS;
401401
sub = &rt->playback;
402402
} else if (alsa_sub->stream == SNDRV_PCM_STREAM_CAPTURE) {
403-
if (rt->rate >= 0)
403+
if (rt->rate < ARRAY_SIZE(rates))
404404
alsa_rt->hw.rates = rates_alsaid[rt->rate];
405405
alsa_rt->hw.channels_max = IN_N_CHANNELS;
406406
sub = &rt->capture;

0 commit comments

Comments
 (0)