summaryrefslogtreecommitdiff
path: root/sound/core/sound.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-07-01 08:34:15 +0200
committerTakashi Iwai <tiwai@suse.de>2021-07-01 08:34:15 +0200
commit498386d1c4d98a72db7a2f51473593ad563b45ae (patch)
treef94e6b211b9a50106e6e047cd992ae3e209ef007 /sound/core/sound.c
parent5c6d4f97267f02f47acea8a652265348ec12de51 (diff)
parentdfc2e8ae4066a95c7f9c2bb2dfa26651feaa6b83 (diff)
downloadlwn-498386d1c4d98a72db7a2f51473593ad563b45ae.tar.gz
lwn-498386d1c4d98a72db7a2f51473593ad563b45ae.zip
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/core/sound.c')
-rw-r--r--sound/core/sound.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/sound.c b/sound/core/sound.c
index af89e51dd44a..df5571d98629 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -357,7 +357,8 @@ static void snd_minor_info_read(struct snd_info_entry *entry, struct snd_info_bu
mutex_lock(&sound_mutex);
for (minor = 0; minor < SNDRV_OS_MINORS; ++minor) {
- if (!(mptr = snd_minors[minor]))
+ mptr = snd_minors[minor];
+ if (!mptr)
continue;
if (mptr->card >= 0) {
if (mptr->device >= 0)