From 97535f7d792eb17e3e4ca25c036a7660777a83ea Mon Sep 17 00:00:00 2001 From: Peter Eriksen Date: Mon, 29 Jan 2007 14:45:53 +0100 Subject: [PATCH] --- yaml --- r: 47190 b: refs/heads/master c: 377a4f7ea35d7d6cc05faea7030522d93435dc11 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/isa/gus/gus_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ec83c9cdd8dd..0a4ee945cbe1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd7509a43c3047a6339484e5009c2db7ee4c7a51 +refs/heads/master: 377a4f7ea35d7d6cc05faea7030522d93435dc11 diff --git a/trunk/sound/isa/gus/gus_main.c b/trunk/sound/isa/gus/gus_main.c index b680fddf0d74..8ced5e81b9a7 100644 --- a/trunk/sound/isa/gus/gus_main.c +++ b/trunk/sound/isa/gus/gus_main.c @@ -294,10 +294,10 @@ static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches) gus->mix_cntrl_reg |= 4; /* enable MIC */ } dma1 = gus->gf1.dma1; - dma1 = dma1 < 0 ? -dma1 : dma1; + dma1 = abs(dma1); dma1 = dmas[dma1 & 7]; dma2 = gus->gf1.dma2; - dma2 = dma2 < 0 ? -dma2 : dma2; + dma2 = abs(dma2); dma2 = dmas[dma2 & 7]; dma1 |= gus->equal_dma ? 0x40 : (dma2 << 3); @@ -306,7 +306,7 @@ static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches) return -EINVAL; } irq = gus->gf1.irq; - irq = irq < 0 ? -irq : irq; + irq = abs(irq); irq = irqs[irq & 0x0f]; if (irq == 0) { snd_printk(KERN_ERR "Error! IRQ isn't defined.\n");