diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-08-12 09:25:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-08-12 09:25:07 +0200 |
| commit | ddf1a212905aeb555249fddade7aa7a47f4167c4 (patch) | |
| tree | 1263dfd1478021f41368a47168d65eb867bdb09e /sound/core | |
| parent | 72c0f57dbe8bf625108dc67e34f3472f28501776 (diff) | |
| parent | 004eb8ba776ccd3e296ea6f78f7ae7985b12824e (diff) | |
| download | lwn-ddf1a212905aeb555249fddade7aa7a47f4167c4.tar.gz lwn-ddf1a212905aeb555249fddade7aa7a47f4167c4.zip | |
Merge branch 'for-linus' into for-next
Pull 6.11 devel branch for further development
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -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; } |