Merge branch 'fix/misc' into topic/misc (03081106) · Commits · e / devices / android_kernel_fairphone_FP4

MAINTAINERS

+5 −0

Original line number	Diff line number	Diff line
		@@ -5532,6 +5532,7 @@ F: include/media/7146

		SAMSUNG AUDIO (ASoC) DRIVERS
		M: Jassi Brar <jassisinghbrar@gmail.com>
		M: Sangbeom Kim <sbkim73@samsung.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Supported
		F: sound/soc/samsung
		@@ -7199,6 +7200,9 @@ W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
		S: Supported
		F: Documentation/hwmon/wm83??
		F: drivers/leds/leds-wm83*.c
		F: drivers/input/misc/wm831x-on.c
		F: drivers/input/touchscreen/wm831x-ts.c
		F: drivers/input/touchscreen/wm97*.c
		F: drivers/mfd/wm8*.c
		F: drivers/power/wm83*.c
		F: drivers/rtc/rtc-wm83*.c
		@@ -7208,6 +7212,7 @@ F: drivers/watchdog/wm83*_wdt.c
		F: include/linux/mfd/wm831x/
		F: include/linux/mfd/wm8350/
		F: include/linux/mfd/wm8400*
		F: include/linux/wm97xx.h
		F: include/sound/wm????.h
		F: sound/soc/codecs/wm*

sound/aoa/fabrics/layout.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1073,10 +1073,10 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
		sdev->pcmid = -1;
		list_del(&ldev->list);
		layouts_list_items--;
		kfree(ldev);
		outnodev:
		of_node_put(sound);
		layout_device = NULL;
		kfree(ldev);
		return -ENODEV;
		}

sound/core/pcm_lib.c

+24 −9

Original line number	Diff line number	Diff line
		@@ -1761,6 +1761,10 @@ static int wait_for_avail(struct snd_pcm_substream *substream,
		snd_pcm_uframes_t avail = 0;
		long wait_time, tout;

		init_waitqueue_entry(&wait, current);
		set_current_state(TASK_INTERRUPTIBLE);
		add_wait_queue(&runtime->tsleep, &wait);

		if (runtime->no_period_wakeup)
		wait_time = MAX_SCHEDULE_TIMEOUT;
		else {
		@@ -1771,16 +1775,32 @@ static int wait_for_avail(struct snd_pcm_substream *substream,
		}
		wait_time = msecs_to_jiffies(wait_time * 1000);
		}
		init_waitqueue_entry(&wait, current);
		add_wait_queue(&runtime->tsleep, &wait);

		for (;;) {
		if (signal_pending(current)) {
		err = -ERESTARTSYS;
		break;
		}

		/*
		* We need to check if space became available already
		* (and thus the wakeup happened already) first to close
		* the race of space already having become available.
		* This check must happen after been added to the waitqueue
		* and having current state be INTERRUPTIBLE.
		*/
		if (is_playback)
		avail = snd_pcm_playback_avail(runtime);
		else
		avail = snd_pcm_capture_avail(runtime);
		if (avail >= runtime->twake)
		break;
		snd_pcm_stream_unlock_irq(substream);
		tout = schedule_timeout_interruptible(wait_time);

		tout = schedule_timeout(wait_time);

		snd_pcm_stream_lock_irq(substream);
		set_current_state(TASK_INTERRUPTIBLE);
		switch (runtime->status->state) {
		case SNDRV_PCM_STATE_SUSPENDED:
		err = -ESTRPIPE;
		@@ -1806,14 +1826,9 @@ static int wait_for_avail(struct snd_pcm_substream *substream,
		err = -EIO;
		break;
		}
		if (is_playback)
		avail = snd_pcm_playback_avail(runtime);
		else
		avail = snd_pcm_capture_avail(runtime);
		if (avail >= runtime->twake)
		break;
		}
		_endloop:
		set_current_state(TASK_RUNNING);
		remove_wait_queue(&runtime->tsleep, &wait);
		*availp = avail;
		return err;

sound/pci/hda/hda_codec.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -579,9 +579,13 @@ int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux,
		return -1;
		}
		recursive++;
		for (i = 0; i < nums; i++)
		for (i = 0; i < nums; i++) {
		unsigned int type = get_wcaps_type(get_wcaps(codec, conn[i]));
		if (type == AC_WID_PIN \|\| type == AC_WID_AUD_OUT)
		continue;
		if (snd_hda_get_conn_index(codec, conn[i], nid, recursive) >= 0)
		return i;
		}
		return -1;
		}
		EXPORT_SYMBOL_HDA(snd_hda_get_conn_index);

sound/pci/hda/hda_eld.c

+19 −12

Original line number	Diff line number	Diff line
		@@ -144,25 +144,17 @@ static int cea_sampling_frequencies[8] = {
		SNDRV_PCM_RATE_192000, /* 7: 192000Hz */
		};

		static unsigned char hdmi_get_eld_byte(struct hda_codec *codec, hda_nid_t nid,
		static unsigned int hdmi_get_eld_data(struct hda_codec *codec, hda_nid_t nid,
		int byte_index)
		{
		unsigned int val;

		val = snd_hda_codec_read(codec, nid, 0,
		AC_VERB_GET_HDMI_ELDD, byte_index);

		#ifdef BE_PARANOID
		printk(KERN_INFO "HDMI: ELD data byte %d: 0x%x\n", byte_index, val);
		#endif

		if ((val & AC_ELDD_ELD_VALID) == 0) {
		snd_printd(KERN_INFO "HDMI: invalid ELD data byte %d\n",
		byte_index);
		val = 0;
		}

		return val & AC_ELDD_ELD_DATA;
		return val;
		}

		#define GRAB_BITS(buf, byte, lowbit, bits) \
		@@ -344,11 +336,26 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,
		if (!buf)
		return -ENOMEM;

		for (i = 0; i < size; i++)
		buf[i] = hdmi_get_eld_byte(codec, nid, i);
		for (i = 0; i < size; i++) {
		unsigned int val = hdmi_get_eld_data(codec, nid, i);
		if (!(val & AC_ELDD_ELD_VALID)) {
		if (!i) {
		snd_printd(KERN_INFO
		"HDMI: invalid ELD data\n");
		ret = -EINVAL;
		goto error;
		}
		snd_printd(KERN_INFO
		"HDMI: invalid ELD data byte %d\n", i);
		val = 0;
		} else
		val &= AC_ELDD_ELD_DATA;
		buf[i] = val;
		}

		ret = hdmi_update_eld(eld, buf, size);

		error:
		kfree(buf);
		return ret;
		}