From 1cf0bc7e730c4148605164ac542c1c191c1d2e09 Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Mon, 17 Sep 2007 14:43:14 +0200 Subject: [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 Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/isa/sc6000.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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, 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"); @@ -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) { -- cgit v1.2.3