Merge tag 'mtd/for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

[linux.git] / sound / usb / mixer_quirks.c

diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 4cb8331d87a4747e1cb2bf5372b951689ea36507..c237e24f08d9bbf51f7b7ce16f5ddb4ffe92a9a0 100644 (file)
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -119,7 +119,7 @@ static int snd_create_std_mono_ctl(struct usb_mixer_interface *mixer,
  * Create a set of standard UAC controls from a table
  */
 static int snd_create_std_mono_table(struct usb_mixer_interface *mixer,
-                               struct std_mono_table *t)
+                                    const struct std_mono_table *t)
 {
        int err;
 
@@ -1386,7 +1386,7 @@ static int snd_c400_create_mixer(struct usb_mixer_interface *mixer)
  * are valid they presents mono controls as L and R channels of
  * stereo. So we provide a good mixer here.
  */
-static struct std_mono_table ebox44_table[] = {
+static const struct std_mono_table ebox44_table[] = {
        {
                .unitid = 4,
                .control = 1,
@@ -1691,7 +1691,7 @@ static const struct snd_kcontrol_new snd_microii_mixer_spdif[] = {
 static int snd_microii_controls_create(struct usb_mixer_interface *mixer)
 {
        int err, i;
-       static usb_mixer_elem_resume_func_t resume_funcs[] = {
+       static const usb_mixer_elem_resume_func_t resume_funcs[] = {
                snd_microii_spdif_default_update,
                NULL,
                snd_microii_spdif_switch_update