Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebe2aa91 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/for-4.12' into for-next

parents cc3a47a2 eeed4cd1

sound/drivers/vx/vx_core.c

+1 −3
Original line number Diff line number Diff line
@@ -795,10 +795,8 @@ struct vx_core *snd_vx_create(struct snd_card *card, struct snd_vx_hardware *hw, 
		return NULL;



	chip = kzalloc(sizeof(*chip) + extra_size, GFP_KERNEL);

	if (! chip) {

		snd_printk(KERN_ERR "vx_core: no memory\n");

	if (! chip)

		return NULL;

	}

	mutex_init(&chip->lock);

	chip->irq = -1;

	chip->hw = hw;

sound/pci/au88x0/au88x0_a3d.c

+1 −1
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ snd_vortex_a3d_filter_put(struct snd_kcontrol *kcontrol, 
	return changed;

}



static struct snd_kcontrol_new vortex_a3d_kcontrol = {

static const struct snd_kcontrol_new vortex_a3d_kcontrol = {

	.iface = SNDRV_CTL_ELEM_IFACE_PCM,

	.name = "Playback PCM advanced processing",

	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,

sound/pci/au88x0/au88x0_eq.c

+3 −3
Original line number Diff line number Diff line
@@ -757,7 +757,7 @@ snd_vortex_eqtoggle_put(struct snd_kcontrol *kcontrol, 
	return 1;		/* Allways changes */

}



static struct snd_kcontrol_new vortex_eqtoggle_kcontrol = {

static const struct snd_kcontrol_new vortex_eqtoggle_kcontrol = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "EQ Enable",

	.index = 0,
@@ -815,7 +815,7 @@ snd_vortex_eq_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucon 
	return changed;

}



static struct snd_kcontrol_new vortex_eq_kcontrol = {

static const struct snd_kcontrol_new vortex_eq_kcontrol = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "                        .",

	.index = 0,
@@ -855,7 +855,7 @@ snd_vortex_peaks_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *u 
	return 0;

}



static struct snd_kcontrol_new vortex_levels_kcontrol = {

static const struct snd_kcontrol_new vortex_levels_kcontrol = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "EQ Peaks",

	.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,

sound/pci/au88x0/au88x0_pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ static int snd_vortex_pcm_vol_put(struct snd_kcontrol *kcontrol, 


static const DECLARE_TLV_DB_MINMAX(vortex_pcm_vol_db_scale, -9600, 2400);



static struct snd_kcontrol_new snd_vortex_pcm_vol = {

static const struct snd_kcontrol_new snd_vortex_pcm_vol = {

	.iface = SNDRV_CTL_ELEM_IFACE_PCM,

	.name = "PCM Playback Volume",

	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |

sound/pci/aw2/aw2-alsa.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static const struct snd_pcm_ops snd_aw2_capture_ops = { 
	.pointer = snd_aw2_pcm_pointer_capture,

};



static struct snd_kcontrol_new aw2_control = {

static const struct snd_kcontrol_new aw2_control = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "PCM Capture Route",

	.index = 0,