Commit 1cf0bc7e authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Jaroslav Kysela

[ALSA] sc6000: 2 minor fixes

This patch zeroes buffer for the card name and
fixes incorrect jump in the probe function.
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 7b758d2f
...@@ -352,6 +352,7 @@ static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma, ...@@ -352,6 +352,7 @@ static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma,
return err; return err;
} }
memset(answer, 0, sizeof(answer));
err = sc6000_dsp_get_answer(vport, GET_DSP_COPYRIGHT, answer, 15); err = sc6000_dsp_get_answer(vport, GET_DSP_COPYRIGHT, answer, 15);
if (err <= 0) { if (err <= 0) {
snd_printk(KERN_ERR "sc6000_dsp_copyright: failed!\n"); 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,7 +531,7 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev)
snd_printk(KERN_ERR PFX snd_printk(KERN_ERR PFX
"SC-6000 port I/O port region is already in use.\n"); "SC-6000 port I/O port region is already in use.\n");
err = -EBUSY; err = -EBUSY;
goto err_unmap2; goto err_unmap1;
} }
vmss_port = devm_ioport_map(devptr, mss_port[dev], 4); vmss_port = devm_ioport_map(devptr, mss_port[dev], 4);
if (!vport) { if (!vport) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment