Linux 6.9-rc4

[sfrench/cifs-2.6.git] / sound / isa / sb / sb16_main.c

diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
index aa48705310231c274ce5d8c8d332a1aca25723d2..a9b87e159b2d11c67416ad9447999e46f46bd768 100644 (file)
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
@@ -703,7 +703,8 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ct
        unsigned char nval, oval;
        int change;
        
-       if ((nval = ucontrol->value.enumerated.item[0]) > 2)
+       nval = ucontrol->value.enumerated.item[0];
+       if (nval > 2)
                return -EINVAL;
        spin_lock_irqsave(&chip->reg_lock, flags);
        oval = snd_sb16_get_dma_mode(chip);
@@ -836,7 +837,8 @@ int snd_sb16dsp_pcm(struct snd_sb *chip, int device)
        struct snd_pcm *pcm;
        int err;
 
-       if ((err = snd_pcm_new(card, "SB16 DSP", device, 1, 1, &pcm)) < 0)
+       err = snd_pcm_new(card, "SB16 DSP", device, 1, 1, &pcm);
+       if (err < 0)
                return err;
        sprintf(pcm->name, "DSP v%i.%i", chip->version >> 8, chip->version & 0xff);
        pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;