diff options
-rw-r--r-- | sound/drivers/serial-u16550.c | 11 | ||||
-rw-r--r-- | sound/pci/via82xx.c | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c index b2b6d50c9425..a25fb7b1f441 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) | |||
963 | if (err < 0) | 963 | if (err < 0) |
964 | goto _err; | 964 | goto _err; |
965 | 965 | ||
966 | sprintf(card->longname, "%s at 0x%lx, irq %d speed %d div %d outs %d ins %d adaptor %s droponfull %d", | 966 | sprintf(card->longname, "%s [%s] at %#lx, irq %d", |
967 | card->shortname, | 967 | card->shortname, |
968 | uart->base, | ||
969 | uart->irq, | ||
970 | uart->speed, | ||
971 | (int)uart->divisor, | ||
972 | outs[dev], | ||
973 | ins[dev], | ||
974 | adaptor_names[uart->adaptor], | 968 | adaptor_names[uart->adaptor], |
975 | uart->drop_on_full); | 969 | uart->base, |
970 | uart->irq); | ||
976 | 971 | ||
977 | snd_card_set_dev(card, &devptr->dev); | 972 | snd_card_set_dev(card, &devptr->dev); |
978 | 973 | ||
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 809b233dd4a3..1ef58c51c213 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, | |||
1687 | return change; | 1687 | return change; |
1688 | } | 1688 | } |
1689 | 1689 | ||
1690 | static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -9450, 150, 1); | 1690 | static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -4650, 150, 1); |
1691 | 1691 | ||
1692 | static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = { | 1692 | static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = { |
1693 | .name = "PCM Playback Volume", | 1693 | .name = "PCM Playback Volume", |