aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/serial-u16550.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-10 10:47:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-10 10:47:07 -0700
commitd5f7badb5687aa14adaf1bd945b7f4605b6d8264 (patch)
tree28a9d01bfb15f1c44627c230aa2a65912c6f53a1 /sound/drivers/serial-u16550.c
parent2c487bbb0ad4d523c9000857f9cc093e1b38504d (diff)
parentbbb2b6829d2afa4cfc58f7c321b2c3aaa7f4835e (diff)
downloadmrst-s0i3-test-d5f7badb5687aa14adaf1bd945b7f4605b6d8264.tar.gz
mrst-s0i3-test-d5f7badb5687aa14adaf1bd945b7f4605b6d8264.tar.xz
mrst-s0i3-test-d5f7badb5687aa14adaf1bd945b7f4605b6d8264.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Fix line-in on Mac Mini Core2 Duo ALSA: Release v1.0.20 sound: via82xx: fix DXS volume range sound: serial-u16550: fix buffer overflow ASoC: Fix errors in WM8990
Diffstat (limited to 'sound/drivers/serial-u16550.c')
-rw-r--r--sound/drivers/serial-u16550.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index b2b6d50c942..a25fb7b1f44 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);