diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-09-17 14:43:14 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 16:50:45 +0200 |
| commit | 1cf0bc7e730c4148605164ac542c1c191c1d2e09 (patch) | |
| tree | be814ea814a46964d788520738e608bd0a5a3f68 /sound | |
| parent | 7b758d2f74be4f255d8c80b5c302d4c3b8fc3863 (diff) | |
| download | linux-3.10-1cf0bc7e730c4148605164ac542c1c191c1d2e09.tar.gz linux-3.10-1cf0bc7e730c4148605164ac542c1c191c1d2e09.tar.bz2 linux-3.10-1cf0bc7e730c4148605164ac542c1c191c1d2e09.zip | |
[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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/isa/sc6000.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c index 3032fa9e9f0..94daf839999 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) { |