diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-11-05 13:03:12 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-11-05 13:03:12 +0100 |
| commit | b22b2e3d9413724c77acd64a97b0817fb767e7f9 (patch) | |
| tree | adf467da1c230e2939d99a3687a13e6849b17cd0 /sound/firewire | |
| parent | ALSA: hda: Fix unused variable warning (diff) | |
| parent | ALSA: usb-audio: Add quirk for HP 320 FHD Webcam (diff) | |
| download | linux-b22b2e3d9413724c77acd64a97b0817fb767e7f9.tar.xz linux-b22b2e3d9413724c77acd64a97b0817fb767e7f9.zip | |
Merge branch 'for-linus' into for-next
Pull 6.12-devel branch for cleanup of USB-audio driver code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/amdtp-stream.c | 3 | ||||
| -rw-r--r-- | sound/firewire/tascam/amdtp-tascam.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index c72b2a754775..7fc51f829ecc 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -172,6 +172,9 @@ static int apply_constraint_to_size(struct snd_pcm_hw_params *params, step = max(step, amdtp_syt_intervals[i]); } + if (step == 0) + return -EINVAL; + t.min = roundup(s->min, step); t.max = rounddown(s->max, step); t.integer = 1; diff --git a/sound/firewire/tascam/amdtp-tascam.c b/sound/firewire/tascam/amdtp-tascam.c index 0b42d6559008..079afa4bd381 100644 --- a/sound/firewire/tascam/amdtp-tascam.c +++ b/sound/firewire/tascam/amdtp-tascam.c @@ -238,7 +238,7 @@ int amdtp_tscm_init(struct amdtp_stream *s, struct fw_unit *unit, err = amdtp_stream_init(s, unit, dir, flags, fmt, process_ctx_payloads, sizeof(struct amdtp_tscm)); if (err < 0) - return 0; + return err; if (dir == AMDTP_OUT_STREAM) { // Use fixed value for FDF field. |