Merge tag 'arm-dt-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / sound / pcmcia / vx / vxp_ops.c

diff --git a/sound/pcmcia/vx/vxp_ops.c b/sound/pcmcia/vx/vxp_ops.c
index 45eeb0f..4176abd 100644 (file)
--- a/sound/pcmcia/vx/vxp_ops.c
+++ b/sound/pcmcia/vx/vxp_ops.c
@@ -237,9 +237,11 @@ static int vxp_load_dsp(struct vx_core *vx, int index, const struct firmware *fw
        switch (index) {
        case 0:
                /* xilinx boot */
-               if ((err = vx_check_magic(vx)) < 0)
+               err = vx_check_magic(vx);
+               if (err < 0)
                        return err;
-               if ((err = snd_vx_load_boot_image(vx, fw)) < 0)
+               err = snd_vx_load_boot_image(vx, fw);
+               if (err < 0)
                        return err;
                return 0;
        case 1: