Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf30f46a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 

Back-merged for refactoring beep stuff.
parents 0959f22e a86b1a2c

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    models depending on the codec chip.  The list of available models

    is found in HD-Audio-Models.txt



    The model name "genric" is treated as a special case.  When this

    The model name "generic" is treated as a special case.  When this

    model is given, the driver uses the generic codec parser without

    "codec-patch".  It's sometimes good for testing and debugging.

Documentation/sound/alsa/seq_oss.html

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ sample data. 
<H4>

7.2.4 Close Callback</H4>

The <TT>close</TT> callback is called when this device is closed by the

applicaion. If any private data was allocated in open callback, it must

application. If any private data was allocated in open callback, it must

be released in the close callback. The deletion of ALSA port should be

done here, too. This callback must not be NULL.

<H4>

sound/core/seq/oss/seq_oss_event.c

+12 −2
Original line number Diff line number Diff line
@@ -285,7 +285,12 @@ local_event(struct seq_oss_devinfo *dp, union evrec *q, struct snd_seq_event *ev 
static int

note_on_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, struct snd_seq_event *ev)

{

	struct seq_oss_synthinfo *info = &dp->synths[dev];

	struct seq_oss_synthinfo *info;



	if (!snd_seq_oss_synth_is_valid(dp, dev))

		return -ENXIO;



	info = &dp->synths[dev];

	switch (info->arg.event_passing) {

	case SNDRV_SEQ_OSS_PROCESS_EVENTS:

		if (! info->ch || ch < 0 || ch >= info->nr_voices) {
@@ -340,7 +345,12 @@ note_on_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, st 
static int

note_off_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, struct snd_seq_event *ev)

{

	struct seq_oss_synthinfo *info = &dp->synths[dev];

	struct seq_oss_synthinfo *info;



	if (!snd_seq_oss_synth_is_valid(dp, dev))

		return -ENXIO;



	info = &dp->synths[dev];

	switch (info->arg.event_passing) {

	case SNDRV_SEQ_OSS_PROCESS_EVENTS:

		if (! info->ch || ch < 0 || ch >= info->nr_voices) {

sound/core/seq/seq_timer.c

+4 −4
Original line number Diff line number Diff line
@@ -290,11 +290,11 @@ int snd_seq_timer_open(struct snd_seq_queue *q) 
			tid.device = SNDRV_TIMER_GLOBAL_SYSTEM;

			err = snd_timer_open(&t, str, &tid, q->queue);

		}

	}

	if (err < 0) {

		snd_printk(KERN_ERR "seq fatal error: cannot create timer (%i)\n", err);

		return err;

	}

	}

	t->callback = snd_seq_timer_interrupt;

	t->callback_data = q;

	t->flags |= SNDRV_TIMER_IFLG_AUTO;

sound/core/vmaster.c

+4 −1
Original line number Diff line number Diff line
@@ -213,7 +213,10 @@ static int slave_put(struct snd_kcontrol *kcontrol, 
	}

	if (!changed)

		return 0;

	return slave_put_val(slave, ucontrol);

	err = slave_put_val(slave, ucontrol);

	if (err < 0)

		return err;

	return 1;

}



static int slave_tlv_cmd(struct snd_kcontrol *kcontrol,