Skip to content

Commit

Permalink
[ALSA] sc6000: 2 minor fixes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Krzysztof Helt authored and Jaroslav Kysela committed Oct 16, 2007
1 parent 7b758d2 commit 1cf0bc7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion sound/isa/sc6000.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma,
return err;
}

memset(answer, 0, sizeof(answer));
err = sc6000_dsp_get_answer(vport, GET_DSP_COPYRIGHT, answer, 15);
if (err <= 0) {
snd_printk(KERN_ERR "sc6000_dsp_copyright: failed!\n");
Expand Down Expand Up @@ -530,7 +531,7 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev)
snd_printk(KERN_ERR PFX
"SC-6000 port I/O port region is already in use.\n");
err = -EBUSY;
goto err_unmap2;
goto err_unmap1;
}
vmss_port = devm_ioport_map(devptr, mss_port[dev], 4);
if (!vport) {
Expand Down

0 comments on commit 1cf0bc7

Please sign in to comment.