summaryrefslogtreecommitdiffstats
path: root/sound/core/pcm_native.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-02-02 18:48:28 +0100
committerTakashi Iwai <tiwai@suse.de>2021-02-02 18:48:33 +0100
commit5c953a226300c961771bc20da6aedf83a980c113 (patch)
tree559341a5e56db25bd1b091354e36ab301f01c119 /sound/core/pcm_native.c
parent9119e5661eab2c56a96b936cde49c6740dc49ff9 (diff)
parent4841b8e6318a7f0ae57c4e5ec09032ea057c97a8 (diff)
downloadlinux-5c953a226300c961771bc20da6aedf83a980c113.tar.bz2
Merge branch 'for-linus' into for-next
Back-merge the 5.11 devel branch for further patching. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/pcm_native.c')
-rw-r--r--sound/core/pcm_native.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 66ae1e248103..893c2abb2f63 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -382,8 +382,8 @@ retry:
continue;
/*
- * The 'deps' array includes maximum three dependencies
- * to SNDRV_PCM_HW_PARAM_XXXs for this rule. The fourth
+ * The 'deps' array includes maximum four dependencies
+ * to SNDRV_PCM_HW_PARAM_XXXs for this rule. The fifth
* member of this array is a sentinel and should be
* negative value.
*