Merge tag 'please-pull-misc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / sound / pci / lx6464es / lx_core.c

diff --git a/sound/pci/lx6464es/lx_core.c b/sound/pci/lx6464es/lx_core.c
index f3d62020ef66c95119461a8836a650f30071f39d..a80684bdc30d6ee3cdad09e6e99be4cef902b7c3 100644 (file)
--- a/sound/pci/lx6464es/lx_core.c
+++ b/sound/pci/lx6464es/lx_core.c
@@ -644,7 +644,7 @@ static int lx_pipe_wait_for_state(struct lx6464es *chip, u32 pipe,
                if (err < 0)
                        return err;
 
-               if (current_state == state)
+               if (!err && current_state == state)
                        return 0;
 
                mdelay(1);