diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-09-17 08:43:14 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 10:50:45 -0400 |
commit | 1cf0bc7e730c4148605164ac542c1c191c1d2e09 (patch) | |
tree | be814ea814a46964d788520738e608bd0a5a3f68 /sound/isa | |
parent | 7b758d2f74be4f255d8c80b5c302d4c3b8fc3863 (diff) |
[ALSA] sc6000: 2 minor fixes
This patch zeroes buffer for the card name and
fixes incorrect jump in the probe function.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/sc6000.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c index 3032fa9e9f03..94daf8399994 100644 --- a/sound/isa/sc6000.c +++ b/sound/isa/sc6000.c | |||
@@ -352,6 +352,7 @@ static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma, | |||
352 | return err; | 352 | return err; |
353 | } | 353 | } |
354 | 354 | ||
355 | memset(answer, 0, sizeof(answer)); | ||
355 | err = sc6000_dsp_get_answer(vport, GET_DSP_COPYRIGHT, answer, 15); | 356 | err = sc6000_dsp_get_answer(vport, GET_DSP_COPYRIGHT, answer, 15); |
356 | if (err <= 0) { | 357 | if (err <= 0) { |
357 | snd_printk(KERN_ERR "sc6000_dsp_copyright: failed!\n"); | 358 | snd_printk(KERN_ERR "sc6000_dsp_copyright: failed!\n"); |
@@ -530,7 +531,7 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) | |||
530 | snd_printk(KERN_ERR PFX | 531 | snd_printk(KERN_ERR PFX |
531 | "SC-6000 port I/O port region is already in use.\n"); | 532 | "SC-6000 port I/O port region is already in use.\n"); |
532 | err = -EBUSY; | 533 | err = -EBUSY; |
533 | goto err_unmap2; | 534 | goto err_unmap1; |
534 | } | 535 | } |
535 | vmss_port = devm_ioport_map(devptr, mss_port[dev], 4); | 536 | vmss_port = devm_ioport_map(devptr, mss_port[dev], 4); |
536 | if (!vport) { | 537 | if (!vport) { |