Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-4
+2
-2
sound/core/timer.c
+2
-2
sound/core/timer.c
···
592
592
else
593
593
timeri->flags |= SNDRV_TIMER_IFLG_PAUSED;
594
594
snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :
595
-
SNDRV_TIMER_EVENT_CONTINUE);
595
+
SNDRV_TIMER_EVENT_PAUSE);
596
596
unlock:
597
597
spin_unlock_irqrestore(&timer->lock, flags);
598
598
return result;
···
614
614
list_del_init(&timeri->ack_list);
615
615
list_del_init(&timeri->active_list);
616
616
snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :
617
-
SNDRV_TIMER_EVENT_CONTINUE);
617
+
SNDRV_TIMER_EVENT_PAUSE);
618
618
spin_unlock(&timeri->timer->lock);
619
619
}
620
620
spin_unlock_irqrestore(&slave_active_lock, flags);
+4
-2
sound/pci/hda/hda_local.h
+4
-2
sound/pci/hda/hda_local.h
···
622
622
{
623
623
return snd_hdac_check_power_state(&codec->core, nid, target_state);
624
624
}
625
-
static inline bool snd_hda_sync_power_state(struct hda_codec *codec,
626
-
hda_nid_t nid, unsigned int target_state)
625
+
626
+
static inline unsigned int snd_hda_sync_power_state(struct hda_codec *codec,
627
+
hda_nid_t nid,
628
+
unsigned int target_state)
627
629
{
628
630
return snd_hdac_sync_power_state(&codec->core, nid, target_state);
629
631
}