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

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

Merge branch 'for-linus' into for-next 



Back-merge for further cleanup / improvements on rawmidi and HD-audio
stuff.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 7373c2a9 39675f7a

sound/core/rawmidi.c

+14 −6
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ static int snd_rawmidi_info_select_user(struct snd_card *card, 
int snd_rawmidi_output_params(struct snd_rawmidi_substream *substream,

			      struct snd_rawmidi_params * params)

{

	char *newbuf;

	char *newbuf, *oldbuf;

	struct snd_rawmidi_runtime *runtime = substream->runtime;

	

	if (substream->append && substream->use_count > 1)
@@ -648,13 +648,17 @@ int snd_rawmidi_output_params(struct snd_rawmidi_substream *substream, 
		return -EINVAL;

	}

	if (params->buffer_size != runtime->buffer_size) {

		newbuf = krealloc(runtime->buffer, params->buffer_size,

				  GFP_KERNEL);

		newbuf = kmalloc(params->buffer_size, GFP_KERNEL);

		if (!newbuf)

			return -ENOMEM;

		spin_lock_irq(&runtime->lock);

		oldbuf = runtime->buffer;

		runtime->buffer = newbuf;

		runtime->buffer_size = params->buffer_size;

		runtime->avail = runtime->buffer_size;

		runtime->appl_ptr = runtime->hw_ptr = 0;

		spin_unlock_irq(&runtime->lock);

		kfree(oldbuf);

	}

	runtime->avail_min = params->avail_min;

	substream->active_sensing = !params->no_active_sensing;
@@ -665,7 +669,7 @@ EXPORT_SYMBOL(snd_rawmidi_output_params); 
int snd_rawmidi_input_params(struct snd_rawmidi_substream *substream,

			     struct snd_rawmidi_params * params)

{

	char *newbuf;

	char *newbuf, *oldbuf;

	struct snd_rawmidi_runtime *runtime = substream->runtime;



	snd_rawmidi_drain_input(substream);
@@ -676,12 +680,16 @@ int snd_rawmidi_input_params(struct snd_rawmidi_substream *substream, 
		return -EINVAL;

	}

	if (params->buffer_size != runtime->buffer_size) {

		newbuf = krealloc(runtime->buffer, params->buffer_size,

				  GFP_KERNEL);

		newbuf = kmalloc(params->buffer_size, GFP_KERNEL);

		if (!newbuf)

			return -ENOMEM;

		spin_lock_irq(&runtime->lock);

		oldbuf = runtime->buffer;

		runtime->buffer = newbuf;

		runtime->buffer_size = params->buffer_size;

		runtime->appl_ptr = runtime->hw_ptr = 0;

		spin_unlock_irq(&runtime->lock);

		kfree(oldbuf);

	}

	runtime->avail_min = params->avail_min;

	return 0;

sound/core/seq/seq_clientmgr.c

+2 −1
Original line number Diff line number Diff line
@@ -2004,6 +2004,7 @@ static int snd_seq_ioctl_query_next_client(struct snd_seq_client *client, 
	struct snd_seq_client *cptr = NULL;



	/* search for next client */

	if (info->client < INT_MAX)

		info->client++;

	if (info->client < 0)

		info->client = 0;

sound/core/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -1520,7 +1520,7 @@ static int snd_timer_user_next_device(struct snd_timer_id __user *_tid) 
				} else {

					if (id.subdevice < 0)

						id.subdevice = 0;

					else

					else if (id.subdevice < INT_MAX)

						id.subdevice++;

				}

			}

sound/pci/hda/hda_codec.c

+3 −2
Original line number Diff line number Diff line
@@ -2922,8 +2922,9 @@ static int hda_codec_runtime_suspend(struct device *dev) 
	list_for_each_entry(pcm, &codec->pcm_list_head, list)

		snd_pcm_suspend_all(pcm->pcm);

	state = hda_call_codec_suspend(codec);

	if (codec_has_clkstop(codec) && codec_has_epss(codec) &&

	    (state & AC_PWRST_CLK_STOP_OK))

	if (codec->link_down_at_suspend ||

	    (codec_has_clkstop(codec) && codec_has_epss(codec) &&

	     (state & AC_PWRST_CLK_STOP_OK)))

		snd_hdac_codec_link_down(&codec->core);

	snd_hdac_link_power(&codec->core, false);

	return 0;

sound/pci/hda/hda_codec.h

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ struct hda_codec { 
	unsigned int power_save_node:1; /* advanced PM for each widget */

	unsigned int auto_runtime_pm:1; /* enable automatic codec runtime pm */

	unsigned int force_pin_prefix:1; /* Add location prefix */

	unsigned int link_down_at_suspend:1; /* link down at runtime suspend */

#ifdef CONFIG_PM

	unsigned long power_on_acct;

	unsigned long power_off_acct;