diff options
Diffstat (limited to 'sound/oss/sb_ess.c')
-rw-r--r-- | sound/oss/sb_ess.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c index 5c773dff5ac5..c0be085e4a20 100644 --- a/sound/oss/sb_ess.c +++ b/sound/oss/sb_ess.c | |||
@@ -1104,15 +1104,15 @@ int ess_init(sb_devc * devc, struct address_info *hw_config) | |||
1104 | default: | 1104 | default: |
1105 | printk (KERN_ERR "Invalid esstype=%d specified\n", devc->sbmo.esstype); | 1105 | printk (KERN_ERR "Invalid esstype=%d specified\n", devc->sbmo.esstype); |
1106 | return 0; | 1106 | return 0; |
1107 | }; | 1107 | } |
1108 | if (submodel != -1) { | 1108 | if (submodel != -1) { |
1109 | devc->submodel = submodel; | 1109 | devc->submodel = submodel; |
1110 | sprintf (modelname, "ES%d", devc->sbmo.esstype); | 1110 | sprintf (modelname, "ES%d", devc->sbmo.esstype); |
1111 | chip = modelname; | 1111 | chip = modelname; |
1112 | }; | 1112 | } |
1113 | if (chip == NULL && (ess_minor & 0x0f) < 8) { | 1113 | if (chip == NULL && (ess_minor & 0x0f) < 8) { |
1114 | chip = "ES688"; | 1114 | chip = "ES688"; |
1115 | }; | 1115 | } |
1116 | #ifdef FKS_TEST | 1116 | #ifdef FKS_TEST |
1117 | FKS_test (devc); | 1117 | FKS_test (devc); |
1118 | #endif | 1118 | #endif |
@@ -1122,7 +1122,7 @@ FKS_test (devc); | |||
1122 | */ | 1122 | */ |
1123 | if (chip == NULL && devc->sbmo.esstype == ESSTYPE_LIKE20) { | 1123 | if (chip == NULL && devc->sbmo.esstype == ESSTYPE_LIKE20) { |
1124 | chip = "ES1688"; | 1124 | chip = "ES1688"; |
1125 | }; | 1125 | } |
1126 | 1126 | ||
1127 | if (chip == NULL) { | 1127 | if (chip == NULL) { |
1128 | int type; | 1128 | int type; |
@@ -1150,8 +1150,8 @@ FKS_test (devc); | |||
1150 | if ((type & 0x00ff) != ((type >> 8) & 0x00ff)) { | 1150 | if ((type & 0x00ff) != ((type >> 8) & 0x00ff)) { |
1151 | printk ("ess_init: Unrecognized %04x\n", type); | 1151 | printk ("ess_init: Unrecognized %04x\n", type); |
1152 | } | 1152 | } |
1153 | }; | 1153 | } |
1154 | }; | 1154 | } |
1155 | #if 0 | 1155 | #if 0 |
1156 | /* | 1156 | /* |
1157 | * this one failed: | 1157 | * this one failed: |
@@ -1182,10 +1182,10 @@ FKS_test (devc); | |||
1182 | chip = "ES1788"; | 1182 | chip = "ES1788"; |
1183 | devc->submodel = SUBMDL_ES1788; | 1183 | devc->submodel = SUBMDL_ES1788; |
1184 | } | 1184 | } |
1185 | }; | 1185 | } |
1186 | if (chip == NULL) { | 1186 | if (chip == NULL) { |
1187 | chip = "ES1688"; | 1187 | chip = "ES1688"; |
1188 | }; | 1188 | } |
1189 | 1189 | ||
1190 | printk ( KERN_INFO "ESS chip %s %s%s\n" | 1190 | printk ( KERN_INFO "ESS chip %s %s%s\n" |
1191 | , chip | 1191 | , chip |
@@ -1293,7 +1293,7 @@ printk(KERN_INFO "ess_set_dma_hw: dma8=%d,dma16=%d,dup=%d\n" | |||
1293 | default: | 1293 | default: |
1294 | printk(KERN_ERR "ESS1887: Invalid DMA16 %d\n", dma); | 1294 | printk(KERN_ERR "ESS1887: Invalid DMA16 %d\n", dma); |
1295 | return 0; | 1295 | return 0; |
1296 | }; | 1296 | } |
1297 | ess_chgmixer (devc, 0x78, 0x20, dma16_bits); | 1297 | ess_chgmixer (devc, 0x78, 0x20, dma16_bits); |
1298 | ess_chgmixer (devc, 0x7d, 0x07, dma_bits); | 1298 | ess_chgmixer (devc, 0x7d, 0x07, dma_bits); |
1299 | } | 1299 | } |
@@ -1584,7 +1584,7 @@ printk(KERN_INFO "FKS: write mixer %x: %x\n", port, value); | |||
1584 | udelay(20); | 1584 | udelay(20); |
1585 | outb(((unsigned char) (value & 0xff)), MIXER_DATA); | 1585 | outb(((unsigned char) (value & 0xff)), MIXER_DATA); |
1586 | udelay(20); | 1586 | udelay(20); |
1587 | }; | 1587 | } |
1588 | spin_unlock_irqrestore(&devc->lock, flags); | 1588 | spin_unlock_irqrestore(&devc->lock, flags); |
1589 | } | 1589 | } |
1590 | 1590 | ||
@@ -1761,7 +1761,7 @@ int ess_mixer_reset (sb_devc * devc) | |||
1761 | ess_chgmixer(devc, 0x7a, 0x18, 0x08); | 1761 | ess_chgmixer(devc, 0x7a, 0x18, 0x08); |
1762 | ess_chgmixer(devc, 0x1c, 0x07, 0x07); | 1762 | ess_chgmixer(devc, 0x1c, 0x07, 0x07); |
1763 | break; | 1763 | break; |
1764 | }; | 1764 | } |
1765 | /* | 1765 | /* |
1766 | * Call set_recmask for proper initialization | 1766 | * Call set_recmask for proper initialization |
1767 | */ | 1767 | */ |