diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:35:05 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:39:31 +0000 |
| commit | 85c675d0d09a45a135bddd15d7b385f8758c32fb (patch) | |
| tree | 76267dbc9b9a130337be3640948fe397b04ac629 /sound/core | |
| parent | Adding upstream version 6.6.15. (diff) | |
| download | linux-85c675d0d09a45a135bddd15d7b385f8758c32fb.tar.xz linux-85c675d0d09a45a135bddd15d7b385f8758c32fb.zip | |
Adding upstream version 6.7.7.upstream/6.7.7
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/control_compat.c | 2 | ||||
| -rw-r--r-- | sound/core/pcm_native.c | 8 | ||||
| -rw-r--r-- | sound/core/rawmidi_compat.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c index 0e8b1bfb04..63d7875010 100644 --- a/sound/core/control_compat.c +++ b/sound/core/control_compat.c @@ -74,7 +74,7 @@ struct snd_ctl_elem_info32 { unsigned char reserved[128]; } value; unsigned char reserved[64]; -} __attribute__((packed)); +} __packed; static int snd_ctl_elem_info_compat(struct snd_ctl_file *ctl, struct snd_ctl_elem_info32 __user *data32) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index bd9ddf412b..f610b08f5a 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3089,7 +3089,7 @@ struct snd_pcm_mmap_status32 { snd_pcm_state_t suspended_state; s32 audio_tstamp_sec; s32 audio_tstamp_nsec; -} __attribute__((packed)); +} __packed; struct snd_pcm_mmap_control32 { u32 appl_ptr; @@ -3106,7 +3106,7 @@ struct snd_pcm_sync_ptr32 { struct snd_pcm_mmap_control32 control; unsigned char reserved[64]; } c; -} __attribute__((packed)); +} __packed; /* recalcuate the boundary within 32bit */ static snd_pcm_uframes_t recalculate_boundary(struct snd_pcm_runtime *runtime) @@ -3527,7 +3527,7 @@ static ssize_t snd_pcm_readv(struct kiocb *iocb, struct iov_iter *to) if (runtime->state == SNDRV_PCM_STATE_OPEN || runtime->state == SNDRV_PCM_STATE_DISCONNECTED) return -EBADFD; - if (!to->user_backed) + if (!user_backed_iter(to)) return -EINVAL; if (to->nr_segs > 1024 || to->nr_segs != runtime->channels) return -EINVAL; @@ -3567,7 +3567,7 @@ static ssize_t snd_pcm_writev(struct kiocb *iocb, struct iov_iter *from) if (runtime->state == SNDRV_PCM_STATE_OPEN || runtime->state == SNDRV_PCM_STATE_DISCONNECTED) return -EBADFD; - if (!from->user_backed) + if (!user_backed_iter(from)) return -EINVAL; if (from->nr_segs > 128 || from->nr_segs != runtime->channels || !frame_aligned(runtime, iov->iov_len)) diff --git a/sound/core/rawmidi_compat.c b/sound/core/rawmidi_compat.c index b81b30d82f..2c6de6e113 100644 --- a/sound/core/rawmidi_compat.c +++ b/sound/core/rawmidi_compat.c @@ -15,7 +15,7 @@ struct snd_rawmidi_params32 { unsigned int no_active_sensing; /* avoid bit-field */ unsigned int mode; unsigned char reserved[12]; -} __attribute__((packed)); +} __packed; static int snd_rawmidi_ioctl_params_compat(struct snd_rawmidi_file *rfile, struct snd_rawmidi_params32 __user *src) @@ -51,7 +51,7 @@ struct compat_snd_rawmidi_status64 { u32 avail; u32 xruns; unsigned char reserved[16]; -} __attribute__((packed)); +} __packed; static int snd_rawmidi_ioctl_status_compat64(struct snd_rawmidi_file *rfile, struct compat_snd_rawmidi_status64 __user *src) |