aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/gus/gus_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/gus/gus_main.c')
-rw-r--r--sound/isa/gus/gus_main.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 5fd374f052ec..4f57ff4ab351 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -246,7 +246,7 @@ static int snd_gus_detect_memory(snd_gus_card_t * gus)
246 snd_gf1_poke(gus, 0L, 0xaa); 246 snd_gf1_poke(gus, 0L, 0xaa);
247 snd_gf1_poke(gus, 1L, 0x55); 247 snd_gf1_poke(gus, 1L, 0x55);
248 if (snd_gf1_peek(gus, 0L) != 0xaa || snd_gf1_peek(gus, 1L) != 0x55) { 248 if (snd_gf1_peek(gus, 0L) != 0xaa || snd_gf1_peek(gus, 1L) != 0x55) {
249 snd_printk("plain GF1 card at 0x%lx without onboard DRAM?\n", gus->gf1.port); 249 snd_printk(KERN_ERR "plain GF1 card at 0x%lx without onboard DRAM?\n", gus->gf1.port);
250 return -ENOMEM; 250 return -ENOMEM;
251 } 251 }
252 for (idx = 1, d = 0xab; idx < 4; idx++, d++) { 252 for (idx = 1, d = 0xab; idx < 4; idx++, d++) {
@@ -299,20 +299,17 @@ static int snd_gus_init_dma_irq(snd_gus_card_t * gus, int latches)
299 dma2 = gus->gf1.dma2; 299 dma2 = gus->gf1.dma2;
300 dma2 = dma2 < 0 ? -dma2 : dma2; 300 dma2 = dma2 < 0 ? -dma2 : dma2;
301 dma2 = dmas[dma2 & 7]; 301 dma2 = dmas[dma2 & 7];
302#if 0
303 printk("dma1 = %i, dma2 = %i\n", gus->gf1.dma1, gus->gf1.dma2);
304#endif
305 dma1 |= gus->equal_dma ? 0x40 : (dma2 << 3); 302 dma1 |= gus->equal_dma ? 0x40 : (dma2 << 3);
306 303
307 if ((dma1 & 7) == 0 || (dma2 & 7) == 0) { 304 if ((dma1 & 7) == 0 || (dma2 & 7) == 0) {
308 snd_printk("Error! DMA isn't defined.\n"); 305 snd_printk(KERN_ERR "Error! DMA isn't defined.\n");
309 return -EINVAL; 306 return -EINVAL;
310 } 307 }
311 irq = gus->gf1.irq; 308 irq = gus->gf1.irq;
312 irq = irq < 0 ? -irq : irq; 309 irq = irq < 0 ? -irq : irq;
313 irq = irqs[irq & 0x0f]; 310 irq = irqs[irq & 0x0f];
314 if (irq == 0) { 311 if (irq == 0) {
315 snd_printk("Error! IRQ isn't defined.\n"); 312 snd_printk(KERN_ERR "Error! IRQ isn't defined.\n");
316 return -EINVAL; 313 return -EINVAL;
317 } 314 }
318 irq |= 0x40; 315 irq |= 0x40;
@@ -400,8 +397,8 @@ static int snd_gus_check_version(snd_gus_card_t * gus)
400 strcpy(card->longname, "Gravis UltraSound Extreme"); 397 strcpy(card->longname, "Gravis UltraSound Extreme");
401 gus->ess_flag = 1; 398 gus->ess_flag = 1;
402 } else { 399 } else {
403 snd_printk("unknown GF1 revision number at 0x%lx - 0x%x (0x%x)\n", gus->gf1.port, rev, val); 400 snd_printk(KERN_ERR "unknown GF1 revision number at 0x%lx - 0x%x (0x%x)\n", gus->gf1.port, rev, val);
404 snd_printk(" please - report to <perex@suse.cz>\n"); 401 snd_printk(KERN_ERR " please - report to <perex@suse.cz>\n");
405 } 402 }
406 } 403 }
407 } 404 }
@@ -425,7 +422,7 @@ int snd_gus_initialize(snd_gus_card_t *gus)
425 422
426 if (!gus->interwave) { 423 if (!gus->interwave) {
427 if ((err = snd_gus_check_version(gus)) < 0) { 424 if ((err = snd_gus_check_version(gus)) < 0) {
428 snd_printk("version check failed\n"); 425 snd_printk(KERN_ERR "version check failed\n");
429 return err; 426 return err;
430 } 427 }
431 if ((err = snd_gus_detect_memory(gus)) < 0) 428 if ((err = snd_gus_detect_memory(gus)) < 0)