diff options
Diffstat (limited to 'sound/drivers')
-rw-r--r-- | sound/drivers/pcsp/pcsp_mixer.c | 2 | ||||
-rw-r--r-- | sound/drivers/serial-u16550.c | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sound/drivers/pcsp/pcsp_mixer.c b/sound/drivers/pcsp/pcsp_mixer.c index caeb0f57fcca..771955a9be71 100644 --- a/sound/drivers/pcsp/pcsp_mixer.c +++ b/sound/drivers/pcsp/pcsp_mixer.c | |||
@@ -50,7 +50,7 @@ static int pcsp_treble_info(struct snd_kcontrol *kcontrol, | |||
50 | uinfo->value.enumerated.items = chip->max_treble + 1; | 50 | uinfo->value.enumerated.items = chip->max_treble + 1; |
51 | if (uinfo->value.enumerated.item > chip->max_treble) | 51 | if (uinfo->value.enumerated.item > chip->max_treble) |
52 | uinfo->value.enumerated.item = chip->max_treble; | 52 | uinfo->value.enumerated.item = chip->max_treble; |
53 | sprintf(uinfo->value.enumerated.name, "%d", | 53 | sprintf(uinfo->value.enumerated.name, "%lu", |
54 | PCSP_CALC_RATE(uinfo->value.enumerated.item)); | 54 | PCSP_CALC_RATE(uinfo->value.enumerated.item)); |
55 | return 0; | 55 | return 0; |
56 | } | 56 | } |
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 | ||