Skip to content

Commit 750ce8c

Browse files
committed
Merge tag 'sound-fix-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "A collection of pending small fixes: ALSA core: - PCM memory leak fix ASoC: - Lots of SOF and Intel driver fixes - Addition of COMMON_CLK for wcd934x - Regression fixes for AMD and Tegra platforms HD-audio: - DP-MST HDMI regression fix, Tegra workarounds, HP quirk fix Others: - A few fixes relevant with the recent uapi-updates - Sparse warnings and endianness fixes" * tag 'sound-fix-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (35 commits) ALSA: hda: Clear RIRB status before reading WP ALSA: hda/realtek - Fixed one of HP ALC671 platform Headset Mic supported ASoC: wcd934x: Add missing COMMON_CLK dependency to SND_SOC_ALL_CODECS ALSA: hda - Fix DP-MST support for NVIDIA codecs ASoC: wcd934x: Add missing COMMON_CLK dependency MAINTAINERS: Remove the Bard Liao from the MAINTAINERS of Realtek CODECs ASoC: tegra: Revert 24 and 32 bit support ASoC: SOF: Intel: add PCI ID for JasperLake ALSA: hdsp: Make the firmware loading ioctl a bit more readable ALSA: emu10k1: Fix annotation and cast for the recent uapi header change ALSA: dummy: Fix PCM format loop in proc output ALSA: usb-audio: Annotate endianess in Scarlett gen2 quirk ALSA: usb-audio: Fix endianess in descriptor validation ALSA: hda: Add JasperLake PCI ID and codec vid ALSA: pcm: Fix sparse warnings wrt snd_pcm_state_t ALSA: pcm: Fix memory leak at closing a stream without hw_free ALSA: uapi: Fix sparse warning ASoC: rt715: Add __maybe_unused to PM callbacks ASoC: rt711: Add __maybe_unused to PM callbacks ASoC: rt700: Add __maybe_unused to PM callbacks ...
2 parents 4c46bef + 6954b32 commit 750ce8c

39 files changed

+489
-362
lines changed

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14106,7 +14106,6 @@ F: include/linux/platform_data/rtc-*
1410614106
F: tools/testing/selftests/rtc/
1410714107

1410814108
REALTEK AUDIO CODECS
14109-
M: Bard Liao <[email protected]>
1411014109
M: Oder Chiou <[email protected]>
1411114110
S: Maintained
1411214111
F: sound/soc/codecs/rt*

include/sound/pcm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,7 @@ struct snd_pcm_status64 {
14501450
#define SNDRV_PCM_IOCTL_STATUS_EXT64 _IOWR('A', 0x24, struct snd_pcm_status64)
14511451

14521452
struct snd_pcm_status32 {
1453-
s32 state; /* stream state */
1453+
snd_pcm_state_t state; /* stream state */
14541454
s32 trigger_tstamp_sec; /* time when stream was started/stopped/paused */
14551455
s32 trigger_tstamp_nsec;
14561456
s32 tstamp_sec; /* reference timestamp */
@@ -1461,7 +1461,7 @@ struct snd_pcm_status32 {
14611461
u32 avail; /* number of frames available */
14621462
u32 avail_max; /* max frames available on hw since last status */
14631463
u32 overrange; /* count of ADC (capture) overrange detections from last status */
1464-
s32 suspended_state; /* suspended stream state */
1464+
snd_pcm_state_t suspended_state; /* suspended stream state */
14651465
u32 audio_tstamp_data; /* needed for 64-bit alignment, used for configs/report to/from userspace */
14661466
s32 audio_tstamp_sec; /* sample counter, wall clock, PHC or on-demand sync'ed */
14671467
s32 audio_tstamp_nsec;

include/uapi/sound/asound.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,13 +564,13 @@ typedef char __pad_after_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
564564
#endif
565565

566566
struct __snd_pcm_mmap_status64 {
567-
__s32 state; /* RO: state - SNDRV_PCM_STATE_XXXX */
567+
snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */
568568
__u32 pad1; /* Needed for 64 bit alignment */
569569
__pad_before_uframe __pad1;
570570
snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */
571571
__pad_after_uframe __pad2;
572572
struct __snd_timespec64 tstamp; /* Timestamp */
573-
__s32 suspended_state; /* RO: suspended stream state */
573+
snd_pcm_state_t suspended_state;/* RO: suspended stream state */
574574
__u32 pad3; /* Needed for 64 bit alignment */
575575
struct __snd_timespec64 audio_tstamp; /* sample counter or wall clock */
576576
};

sound/core/pcm_compat.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static int snd_pcm_channel_info_user(struct snd_pcm_substream *substream,
156156
#endif /* CONFIG_X86_X32 */
157157

158158
struct compat_snd_pcm_status64 {
159-
s32 state;
159+
snd_pcm_state_t state;
160160
u8 rsvd[4]; /* alignment */
161161
s64 trigger_tstamp_sec;
162162
s64 trigger_tstamp_nsec;
@@ -168,7 +168,7 @@ struct compat_snd_pcm_status64 {
168168
u32 avail;
169169
u32 avail_max;
170170
u32 overrange;
171-
s32 suspended_state;
171+
snd_pcm_state_t suspended_state;
172172
u32 audio_tstamp_data;
173173
s64 audio_tstamp_sec;
174174
s64 audio_tstamp_nsec;
@@ -376,13 +376,13 @@ static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream,
376376
#ifdef CONFIG_X86_X32
377377
/* X32 ABI has 64bit timespec and 64bit alignment */
378378
struct snd_pcm_mmap_status_x32 {
379-
s32 state;
379+
snd_pcm_state_t state;
380380
s32 pad1;
381381
u32 hw_ptr;
382382
u32 pad2; /* alignment */
383383
s64 tstamp_sec;
384384
s64 tstamp_nsec;
385-
s32 suspended_state;
385+
snd_pcm_state_t suspended_state;
386386
s32 pad3;
387387
s64 audio_tstamp_sec;
388388
s64 audio_tstamp_nsec;

0 commit comments

Comments
 (0)