Skip to contentSkip to conversation

sound fixes for 4.17-rc7

GIT PULL Takashi Iwai 1 participant 1 message May 25, 2018 Sound

lore
Share & tools
lore
#0 lore raw

Linus,

please pull sound fixes for v4.17-rc7 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.17-rc7

The topmost commit is 009f8c90f571d87855914dbc20e6c0ea2a3b19ae

----------------------------------------------------------------

sound fixes for 4.17-rc7

Two fixes:
- A timer pause event notification was garbled upon the recent hardening work; corrected now
- HD-audio runtime PM regression fix due to the incorrect return type

----------------------------------------------------------------

Ben Hutchings (1):
ALSA: timer: Fix pause event notification

Lukas Wunner (1):
ALSA: hda - Fix runtime PM

---
 sound/core/timer.c        | 4 ++--
 sound/pci/hda/hda_local.h | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)
sound/core/timer.c +2 -2
index dc87728c5b74..0ddcae495838 100644
@@ -592,7 +592,7 @@ static int snd_timer_stop1(struct snd_timer_instance *timeri, bool stop)
 	else
 		timeri->flags |= SNDRV_TIMER_IFLG_PAUSED;
 	snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :
-			  SNDRV_TIMER_EVENT_CONTINUE);
+			  SNDRV_TIMER_EVENT_PAUSE);
  unlock:
 	spin_unlock_irqrestore(&timer->lock, flags);
 	return result;
@@ -614,7 +614,7 @@ static int snd_timer_stop_slave(struct snd_timer_instance *timeri, bool stop)
 		list_del_init(&timeri->ack_list);
 		list_del_init(&timeri->active_list);
 		snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :
-				  SNDRV_TIMER_EVENT_CONTINUE);
+				  SNDRV_TIMER_EVENT_PAUSE);
 		spin_unlock(&timeri->timer->lock);
 	}
 	spin_unlock_irqrestore(&slave_active_lock, flags);
sound/pci/hda/hda_local.h +4 -2
index 321e78baa63c..9bd935216c18 100644
@@ -622,8 +622,10 @@ snd_hda_check_power_state(struct hda_codec *codec, hda_nid_t nid,
 {
 	return snd_hdac_check_power_state(&codec->core, nid, target_state);
 }
-static inline bool snd_hda_sync_power_state(struct hda_codec *codec,
-			   hda_nid_t nid, unsigned int target_state)
+
+static inline unsigned int snd_hda_sync_power_state(struct hda_codec *codec,
+						    hda_nid_t nid,
+						    unsigned int target_state)
 {
 	return snd_hdac_sync_power_state(&codec->core, nid, target_state);
 }