From: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Mon, 17 Sep 2007 12:43:14 +0000 (+0200)
Subject: [ALSA] sc6000: 2 minor fixes
X-Git-Tag: v2.6.24-rc1~832^2~46
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=1cf0bc7e730c4148605164ac542c1c191c1d2e09;p=safe%2Fjmp%2Flinux-2.6

[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>
---

diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c
index 3032fa9..94daf83 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) {