ALSA: vx: Fix assignment in if condition

[sfrench/cifs-2.6.git] / sound / drivers / vx / vx_pcm.c

diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index daffda99b4f7998d5c3971da3034267a39190624..3924f5283745e4b78da4dc54ac41625ddb5441bc 100644 (file)
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
@@ -341,10 +341,12 @@ static int vx_toggle_pipe(struct vx_core *chip, struct vx_pipe *pipe, int state)
                }
        }
     
-       if ((err = vx_conf_pipe(chip, pipe)) < 0)
+       err = vx_conf_pipe(chip, pipe);
+       if (err < 0)
                return err;
 
-       if ((err = vx_send_irqa(chip)) < 0)
+       err = vx_send_irqa(chip);
+       if (err < 0)
                return err;
     
        /* If it completes successfully, wait for the pipes
@@ -680,8 +682,9 @@ static void vx_pcm_playback_transfer(struct vx_core *chip,
        if (! pipe->prepared || (chip->chip_status & VX_STAT_IS_STALE))
                return;
        for (i = 0; i < nchunks; i++) {
-               if ((err = vx_pcm_playback_transfer_chunk(chip, runtime, pipe,
-                                                         chip->ibl.size)) < 0)
+               err = vx_pcm_playback_transfer_chunk(chip, runtime, pipe,
+                                                    chip->ibl.size);
+               if (err < 0)
                        return;
        }
 }
@@ -698,7 +701,8 @@ static void vx_pcm_playback_update(struct vx_core *chip,
        struct snd_pcm_runtime *runtime = subs->runtime;
 
        if (pipe->running && ! (chip->chip_status & VX_STAT_IS_STALE)) {
-               if ((err = vx_update_pipe_position(chip, runtime, pipe)) < 0)
+               err = vx_update_pipe_position(chip, runtime, pipe);
+               if (err < 0)
                        return;
                if (pipe->transferred >= (int)runtime->period_size) {
                        pipe->transferred %= runtime->period_size;
@@ -747,11 +751,13 @@ static int vx_pcm_trigger(struct snd_pcm_substream *subs, int cmd)
                pipe->running = 0;
                break;
        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-               if ((err = vx_toggle_pipe(chip, pipe, 0)) < 0)
+               err = vx_toggle_pipe(chip, pipe, 0);
+               if (err < 0)
                        return err;
                break;
        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-               if ((err = vx_toggle_pipe(chip, pipe, 1)) < 0)
+               err = vx_toggle_pipe(chip, pipe, 1);
+               if (err < 0)
                        return err;
                break;
        default:
@@ -792,13 +798,15 @@ static int vx_pcm_prepare(struct snd_pcm_substream *subs)
                snd_printdd(KERN_DEBUG "reopen the pipe with data_mode = %d\n", data_mode);
                vx_init_rmh(&rmh, CMD_FREE_PIPE);
                vx_set_pipe_cmd_params(&rmh, 0, pipe->number, 0);
-               if ((err = vx_send_msg(chip, &rmh)) < 0)
+               err = vx_send_msg(chip, &rmh);
+               if (err < 0)
                        return err;
                vx_init_rmh(&rmh, CMD_RES_PIPE);
                vx_set_pipe_cmd_params(&rmh, 0, pipe->number, pipe->channels);
                if (data_mode)
                        rmh.Cmd[0] |= BIT_DATA_MODE;
-               if ((err = vx_send_msg(chip, &rmh)) < 0)
+               err = vx_send_msg(chip, &rmh);
+               if (err < 0)
                        return err;
                pipe->data_mode = data_mode;
        }
@@ -810,7 +818,8 @@ static int vx_pcm_prepare(struct snd_pcm_substream *subs)
        }
        vx_set_clock(chip, runtime->rate);
 
-       if ((err = vx_set_format(chip, pipe, runtime)) < 0)
+       err = vx_set_format(chip, pipe, runtime);
+       if (err < 0)
                return err;
 
        if (vx_is_pcmcia(chip)) {
@@ -1187,7 +1196,8 @@ int snd_vx_pcm_new(struct vx_core *chip)
        unsigned int i;
        int err;
 
-       if ((err = vx_init_audio_io(chip)) < 0)
+       err = vx_init_audio_io(chip);
+       if (err < 0)
                return err;
 
        for (i = 0; i < chip->hw->num_codecs; i++) {