This is a note to let you know that I've just added the patch titled
ASoC: siu: Fix build error by a wrong const prefix
to the 5.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-siu-fix-build-error-by-a-wrong-const-prefix.patch
and it can be found in the queue-5.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ae07f5c7c5e9ebca5b9d6471bb4b99a9da5c6d88 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Tue, 26 Jan 2021 16:47:02 +0100
Subject: ASoC: siu: Fix build error by a wrong const prefix
From: Takashi Iwai <tiwai@xxxxxxx>
commit ae07f5c7c5e9ebca5b9d6471bb4b99a9da5c6d88 upstream.
A const prefix was put wrongly in the middle at the code refactoring
commit 932eaf7c7904 ("ASoC: sh: siu_pcm: remove snd_pcm_ops"), which
leads to a build error as:
sound/soc/sh/siu_pcm.c:546:8: error: expected '{' before 'const'
Also, another inconsistency is that the declaration of siu_component
misses the const prefix.
This patch corrects both failures.
Fixes: 932eaf7c7904 ("ASoC: sh: siu_pcm: remove snd_pcm_ops")
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Link: https://lore.kernel.org/r/20210126154702.3974-1-tiwai@xxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/sh/siu.h | 2 +-
sound/soc/sh/siu_pcm.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/sh/siu.h
+++ b/sound/soc/sh/siu.h
@@ -169,7 +169,7 @@ static inline u32 siu_read32(u32 __iomem
#define SIU_BRGBSEL (0x108 / sizeof(u32))
#define SIU_BRRB (0x10c / sizeof(u32))
-extern struct snd_soc_component_driver siu_component;
+extern const struct snd_soc_component_driver siu_component;
extern struct siu_info *siu_i2s_data;
int siu_init_port(int port, struct siu_port **port_info, struct snd_card *card);
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -543,7 +543,7 @@ static void siu_pcm_free(struct snd_soc_
dev_dbg(pcm->card->dev, "%s\n", __func__);
}
-struct const snd_soc_component_driver siu_component = {
+const struct snd_soc_component_driver siu_component = {
.name = DRV_NAME,
.open = siu_pcm_open,
.close = siu_pcm_close,
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-5.11/alsa-usb-audio-correct-document-for-snd_usb_endpoint_free_all.patch
queue-5.11/alsa-pcm-don-t-call-sync_stop-if-it-hasn-t-been-stopped.patch
queue-5.11/alsa-usb-audio-fix-pcm-buffer-allocation-in-non-vmalloc-mode.patch
queue-5.11/alsa-usb-audio-handle-invalid-running-state-at-releasing-ep.patch
queue-5.11/alsa-usb-audio-more-strict-state-change-in-ep.patch
queue-5.11/alsa-hda-add-another-cometlake-h-pci-id.patch
queue-5.11/alsa-hda-realtek-quirk-for-hp-spectre-x360-14-amp-setup.patch
queue-5.11/alsa-pcm-assure-sync-with-the-pending-stop-operation-at-suspend.patch
queue-5.11/alsa-fireface-fix-to-parse-sync-status-register-of-latter-protocol.patch
queue-5.11/alsa-hda-realtek-modify-eapd-in-the-alc886.patch
queue-5.11/alsa-pcm-call-sync_stop-at-disconnection.patch
queue-5.11/alsa-hda-hdmi-drop-bogus-check-at-closing-a-stream.patch
queue-5.11/asoc-siu-fix-build-error-by-a-wrong-const-prefix.patch
queue-5.11/alsa-usb-audio-don-t-avoid-stopping-the-stream-at-disconnection.patch
queue-5.11/alsa-usb-audio-add-implicit-fb-quirk-for-boss-gp-10.patch
