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

Commit 6d05d53f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into for-linus 

* fix/misc:
  sound: via82xx: fix DXS volume range
  sound: serial-u16550: fix buffer overflow
parents 091bf762 b452e08e

sound/drivers/serial-u16550.c

+3 −8
Original line number Diff line number Diff line
@@ -963,16 +963,11 @@ static int __devinit snd_serial_probe(struct platform_device *devptr) 
	if (err < 0)

		goto _err;



	sprintf(card->longname, "%s at 0x%lx, irq %d speed %d div %d outs %d ins %d adaptor %s droponfull %d",

	sprintf(card->longname, "%s [%s] at %#lx, irq %d",

		card->shortname,

		uart->base,

		uart->irq,

		uart->speed,

		(int)uart->divisor,

		outs[dev],

		ins[dev],

		adaptor_names[uart->adaptor],

		uart->drop_on_full);

		uart->base,

		uart->irq);



	snd_card_set_dev(card, &devptr->dev);

sound/pci/via82xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1687,7 +1687,7 @@ static int snd_via8233_pcmdxs_volume_put(struct snd_kcontrol *kcontrol, 
	return change;

}



static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -9450, 150, 1);

static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -4650, 150, 1);



static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = {

	.name = "PCM Playback Volume",