summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-05-10 12:05:53 +0200
committerTakashi Iwai <tiwai@suse.de>2009-05-10 12:05:53 +0200
commit6d05d53f562e8c74b6922fc69a5685207759c905 (patch)
treeb7486d91c3942571ade282b3de858b9d456bb15a
parent091bf7624d1c90cec9e578a18529f615213ff847 (diff)
parentb452e08e73c0e3dbb0be82130217be4b7084299e (diff)
downloadop-kernel-dev-6d05d53f562e8c74b6922fc69a5685207759c905.zip
op-kernel-dev-6d05d53f562e8c74b6922fc69a5685207759c905.tar.gz
Merge branch 'fix/misc' into for-linus
* fix/misc: sound: via82xx: fix DXS volume range sound: serial-u16550: fix buffer overflow
-rw-r--r--sound/drivers/serial-u16550.c11
-rw-r--r--sound/pci/via82xx.c2
2 files changed, 4 insertions, 9 deletions
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index b2b6d50..a25fb7b 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -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);
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 809b233..1ef58c5 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -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",
OpenPOWER on IntegriCloud