diff options
author | Takashi Iwai <tiwai@suse.de> | 2024-08-10 10:48:32 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2024-08-10 10:49:14 +0200 |
commit | ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436 (patch) | |
tree | 1748dc74e0a11c9df21632a312f151fe15916f50 | |
parent | Merge tag 'asoc-fix-v6.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
download | linux-ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436.tar.xz linux-ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436.zip |
ALSA: timer: Relax start tick time check for slave timer elements
The recent addition of a sanity check for a too low start tick time
seems breaking some applications that uses aloop with a certain slave
timer setup. They may have the initial resolution 0, hence it's
treated as if it were a too low value.
Relax and skip the check for the slave timer instance for addressing
the regression.
Fixes: 4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
Cc: <stable@vger.kernel.org>
Link: https://github.com/raspberrypi/linux/issues/6294
Link: https://patch.msgid.link/20240810084833.10939-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/core/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index d104adc75a8b..71a07c1662f5 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -547,7 +547,7 @@ static int snd_timer_start1(struct snd_timer_instance *timeri, /* check the actual time for the start tick; * bail out as error if it's way too low (< 100us) */ - if (start) { + if (start && !(timer->hw.flags & SNDRV_TIMER_HW_SLAVE)) { if ((u64)snd_timer_hw_resolution(timer) * ticks < 100000) return -EINVAL; } |