X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=sound%2Fisa%2Fsc6000.c;h=da3d152bcad4d0b5bd7d29b2c1ee1cb5104eaf7a;hb=9b610fda0df5d0f0b0c64242e37441ad1b384aac;hp=d4a4ccfc2fd71b80030787e027bcdcd8e6dab466;hpb=e307258d5b27e3f9cde56df4038c89470710e2e4;p=linux-2.6-omap-h63xx.git

diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c
index d4a4ccfc2fd..da3d152bcad 100644
--- a/sound/isa/sc6000.c
+++ b/sound/isa/sc6000.c
@@ -23,8 +23,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <linux/module.h>
+#include <linux/delay.h>
 #include <linux/isa.h>
 #include <linux/io.h>
 #include <asm/dma.h>
@@ -351,6 +351,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");
@@ -388,7 +389,7 @@ static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma,
 
 	err = sc6000_init_mss(vport, config, vmss_port, mss_config);
 	if (err < 0) {
-		snd_printk(KERN_ERR "Can not initialize"
+		snd_printk(KERN_ERR "Can not initialize "
 			   "Microsoft Sound System mode.\n");
 		return -ENODEV;
 	}
@@ -529,7 +530,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) {