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

Commit a1a9f537 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "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"

* tag 'sound-4.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix runtime PM
  ALSA: timer: Fix pause event notification
parents b5069438 009f8c90

sound/core/timer.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

}