Merge tag 'omap-for-v5.8/dt-missed-signed' of git://git.kernel.org/pub/scm/linux...

[platform/kernel/linux-rpi.git] / sound / ppc / pmac.c

diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 592532c..2e750b3 100644 (file)
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -226,7 +226,7 @@ static int snd_pmac_pcm_prepare(struct snd_pmac *chip, struct pmac_stream *rec,
                offset += rec->period_size;
        }
        /* make loop */
-       cp->command = cpu_to_le16(DBDMA_NOP + BR_ALWAYS);
+       cp->command = cpu_to_le16(DBDMA_NOP | BR_ALWAYS);
        cp->cmd_dep = cpu_to_le32(rec->cmd.addr);
 
        snd_pmac_dma_stop(rec);
@@ -726,7 +726,7 @@ void snd_pmac_beep_dma_start(struct snd_pmac *chip, int bytes, unsigned long add
        chip->extra_dma.cmds->xfer_status = cpu_to_le16(0);
        chip->extra_dma.cmds->cmd_dep = cpu_to_le32(chip->extra_dma.addr);
        chip->extra_dma.cmds->phy_addr = cpu_to_le32(addr);
-       chip->extra_dma.cmds->command = cpu_to_le16(OUTPUT_MORE + BR_ALWAYS);
+       chip->extra_dma.cmds->command = cpu_to_le16(OUTPUT_MORE | BR_ALWAYS);
        out_le32(&chip->awacs->control,
                 (in_le32(&chip->awacs->control) & ~0x1f00)
                 | (speed << 8));