diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2024-02-21 11:16:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2024-02-21 11:17:06 +0100 |
| commit | 3fdecc7d9aca8a824ce3be9d20f6366d132579fc (patch) | |
| tree | 9be9686f26842e6deb0b04f597711cdc7526f58a /sound/core | |
| parent | ALSA: hda: Downgrade BDL table overflow message (diff) | |
| parent | ALSA: hda/realtek: fix mute/micmute LED For HP mt440 (diff) | |
| download | linux-3fdecc7d9aca8a824ce3be9d20f6366d132579fc.tar.gz linux-3fdecc7d9aca8a824ce3be9d20f6366d132579fc.tar.bz2 linux-3fdecc7d9aca8a824ce3be9d20f6366d132579fc.zip | |
Merge branch 'for-linus' into for-next
Pull 6.8-rc devel branch. The trivial merge conflict got resolved.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/Makefile | 1 | ||||
| -rw-r--r-- | sound/core/ump.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile index 1d34e6950317..b8aa886198ab 100644 --- a/sound/core/Makefile +++ b/sound/core/Makefile @@ -32,7 +32,6 @@ snd-ump-objs := ump.o snd-ump-$(CONFIG_SND_UMP_LEGACY_RAWMIDI) += ump_convert.o snd-timer-objs := timer.o snd-hrtimer-objs := hrtimer.o -snd-rtctimer-objs := rtctimer.o snd-hwdep-objs := hwdep.o snd-seq-device-objs := seq_device.o diff --git a/sound/core/ump.c b/sound/core/ump.c index 3bef1944e955..fe7911498cc4 100644 --- a/sound/core/ump.c +++ b/sound/core/ump.c @@ -985,7 +985,7 @@ static int snd_ump_legacy_open(struct snd_rawmidi_substream *substream) struct snd_ump_endpoint *ump = substream->rmidi->private_data; int dir = substream->stream; int group = ump->legacy_mapping[substream->number]; - int err; + int err = 0; mutex_lock(&ump->open_mutex); if (ump->legacy_substreams[dir][group]) { @@ -1009,7 +1009,7 @@ static int snd_ump_legacy_open(struct snd_rawmidi_substream *substream) spin_unlock_irq(&ump->legacy_locks[dir]); unlock: mutex_unlock(&ump->open_mutex); - return 0; + return err; } static int snd_ump_legacy_close(struct snd_rawmidi_substream *substream) |