[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>
This commit is contained in:
committed by
Jaroslav Kysela
parent
7b758d2f74
commit
1cf0bc7e73
@@ -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)
|
|||||||
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) {
|
||||||
|
Reference in New Issue
Block a user