diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-10 06:05:53 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-10 06:05:53 -0400 |
| commit | 6d05d53f562e8c74b6922fc69a5685207759c905 (patch) | |
| tree | b7486d91c3942571ade282b3de858b9d456bb15a /sound/pci | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
| parent | b452e08e73c0e3dbb0be82130217be4b7084299e (diff) | |
Merge branch 'fix/misc' into for-linus
* fix/misc:
sound: via82xx: fix DXS volume range
sound: serial-u16550: fix buffer overflow
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/via82xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
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", |