Merge tag 'nfs-for-5.11-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-microblaze.git] / sound / atmel / ac97c.c

diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 1006458..66ecbd4 100644 (file)
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -475,12 +475,12 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)
                struct snd_pcm_runtime *runtime;
                int offset, next_period, block_size;
                dev_dbg(&chip->pdev->dev, "channel A event%s%s%s%s%s%s\n",
-                               casr & AC97C_CSR_OVRUN   ? " OVRUN"   : "",
-                               casr & AC97C_CSR_RXRDY   ? " RXRDY"   : "",
-                               casr & AC97C_CSR_UNRUN   ? " UNRUN"   : "",
-                               casr & AC97C_CSR_TXEMPTY ? " TXEMPTY" : "",
-                               casr & AC97C_CSR_TXRDY   ? " TXRDY"   : "",
-                               !casr                    ? " NONE"    : "");
+                       (casr & AC97C_CSR_OVRUN)   ? " OVRUN"   : "",
+                       (casr & AC97C_CSR_RXRDY)   ? " RXRDY"   : "",
+                       (casr & AC97C_CSR_UNRUN)   ? " UNRUN"   : "",
+                       (casr & AC97C_CSR_TXEMPTY) ? " TXEMPTY" : "",
+                       (casr & AC97C_CSR_TXRDY)   ? " TXRDY"   : "",
+                       !casr                      ? " NONE"    : "");
                if ((casr & camr) & AC97C_CSR_ENDTX) {
                        runtime = chip->playback_substream->runtime;
                        block_size = frames_to_bytes(runtime, runtime->period_size);
@@ -521,11 +521,11 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)
 
        if (sr & AC97C_SR_COEVT) {
                dev_info(&chip->pdev->dev, "codec channel event%s%s%s%s%s\n",
-                               cosr & AC97C_CSR_OVRUN   ? " OVRUN"   : "",
-                               cosr & AC97C_CSR_RXRDY   ? " RXRDY"   : "",
-                               cosr & AC97C_CSR_TXEMPTY ? " TXEMPTY" : "",
-                               cosr & AC97C_CSR_TXRDY   ? " TXRDY"   : "",
-                               !cosr                    ? " NONE"    : "");
+                        (cosr & AC97C_CSR_OVRUN)   ? " OVRUN"   : "",
+                        (cosr & AC97C_CSR_RXRDY)   ? " RXRDY"   : "",
+                        (cosr & AC97C_CSR_TXEMPTY) ? " TXEMPTY" : "",
+                        (cosr & AC97C_CSR_TXRDY)   ? " TXRDY"   : "",
+                        !cosr                      ? " NONE"    : "");
                retval = IRQ_HANDLED;
        }