patch-2.4.4 linux/drivers/sound/ymfpci.c

• Lines: 53
• Date: Thu Apr 26 22:17:27 2001
• Orig file: v2.4.3/linux/drivers/sound/ymfpci.c
• Orig date: Tue Mar 20 11:29:01 2001

diff -u --recursive --new-file v2.4.3/linux/drivers/sound/ymfpci.c linux/drivers/sound/ymfpci.c
@@ -6,7 +6,7 @@
  *
  *  This code is a result of high-speed collision
  *  between ymfpci.c of ALSA and cs46xx.c of Linux.
- *  -- Pete Zaitcev <zaitcev@metabyte.com>; 2000/09/18
+ *  -- Pete Zaitcev <zaitcev@yahoo.com>; 2000/09/18
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -1853,6 +1853,7 @@
 		return -ENXIO;
 	}
 
+	unit = NULL;	/* gcc warns */
 	for (list = ymf_devs.next; list != &ymf_devs; list = list->next) {
 		unit = list_entry(list, ymfpci_t, ymf_devs);
 		if (((unit->dev_audio ^ minor) & ~0x0F) == 0)
@@ -2147,8 +2148,8 @@
 	ymfpci_writew(codec, YDSXGR_GLOBALCTRL, ctrl & ~0x0007);
 
 	/* setup DSP instruction code */
-	for (i = 0; i < YDSXG_DSPLENGTH; i++)
-		ymfpci_writel(codec, YDSXGR_DSPINSTRAM + i, DspInst[i >> 2]);
+	for (i = 0; i < YDSXG_DSPLENGTH / 4; i++)
+		ymfpci_writel(codec, YDSXGR_DSPINSTRAM + (i << 2), DspInst[i]);
 
 	switch (codec->pci->device) {
 	case PCI_DEVICE_ID_YAMAHA_724F:
@@ -2163,11 +2164,11 @@
 
 	if (ver_1e) {
 		/* setup control instruction code */
-		for (i = 0; i < YDSXG_CTRLLENGTH; i++)
-			ymfpci_writel(codec, YDSXGR_CTRLINSTRAM + i, CntrlInst1E[i >> 2]);
+		for (i = 0; i < YDSXG_CTRLLENGTH / 4; i++)
+			ymfpci_writel(codec, YDSXGR_CTRLINSTRAM + (i << 2), CntrlInst1E[i]);
 	} else {
-		for (i = 0; i < YDSXG_CTRLLENGTH; i++)
-			ymfpci_writel(codec, YDSXGR_CTRLINSTRAM + i, CntrlInst[i >> 2]);
+		for (i = 0; i < YDSXG_CTRLLENGTH / 4; i++)
+			ymfpci_writel(codec, YDSXGR_CTRLINSTRAM + (i << 2), CntrlInst[i]);
 	}
 
 	ymfpci_enable_dsp(codec);
@@ -2252,7 +2253,7 @@
 
 	/* move this volume setup to mixer */
 	ymfpci_writel(codec, YDSXGR_NATIVEDACOUTVOL, 0x3fff3fff);
-	ymfpci_writel(codec, YDSXGR_BUF441OUTVOL, 0x3fff3fff);
+	ymfpci_writel(codec, YDSXGR_BUF441OUTVOL, 0);
 	ymfpci_writel(codec, YDSXGR_NATIVEADCINVOL, 0x3fff3fff);
 	ymfpci_writel(codec, YDSXGR_NATIVEDACINVOL, 0x3fff3fff);