redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'fix/misc' into for-linus

Browse source 
* fix/misc:
  sound: via82xx: fix DXS volume range
  sound: serial-u16550: fix buffer overflow
This commit is contained in:
Takashi Iwai 2009-05-10 12:05:53 +02:00
parent 091bf7624d b452e08e73
commit 6d05d53f56
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sound/drivers/serial-u16550.c
View file

@ -963,16 +963,11 @@ static int __devinit snd_serial_probe(struct platform_device *devptr)
if (err < 0) if (err < 0)
goto _err; 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, card->shortname,
uart->base,
uart->irq,
uart->speed,
(int)uart->divisor,
outs[dev],
ins[dev],
adaptor_names[uart->adaptor], adaptor_names[uart->adaptor],
uart->drop_on_full); uart->base,
uart->irq);
snd_card_set_dev(card, &devptr->dev); snd_card_set_dev(card, &devptr->dev);

2
sound/pci/via82xx.c
View file

@ -1687,7 +1687,7 @@ static int snd_via8233_pcmdxs_volume_put(struct snd_kcontrol *kcontrol,
return change; 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 = { static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = {
.name = "PCM Playback Volume", .name = "PCM Playback Volume",