aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/isa/sc6000.c3
1 files changed, 2 insertions, 1 deletions
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,
352 return err; 352 return err;
353 } 353 }
354 354
355 memset(answer, 0, sizeof(answer));
355 err = sc6000_dsp_get_answer(vport, GET_DSP_COPYRIGHT, answer, 15); 356 err = sc6000_dsp_get_answer(vport, GET_DSP_COPYRIGHT, answer, 15);
356 if (err <= 0) { 357 if (err <= 0) {
357 snd_printk(KERN_ERR "sc6000_dsp_copyright: failed!\n"); 358 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)
530 snd_printk(KERN_ERR PFX 531 snd_printk(KERN_ERR PFX
531 "SC-6000 port I/O port region is already in use.\n"); 532 "SC-6000 port I/O port region is already in use.\n");
532 err = -EBUSY; 533 err = -EBUSY;
533 goto err_unmap2; 534 goto err_unmap1;
534 } 535 }
535 vmss_port = devm_ioport_map(devptr, mss_port[dev], 4); 536 vmss_port = devm_ioport_map(devptr, mss_port[dev], 4);
536 if (!vport) { 537 if (!vport) {