a52: cleanup write_out_pending() function

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
index e48489e4721c9238a4e18cc57d8108142f1900f8..2edc0a5493ae7e80d3cc010304a90bf361a6e4fb 100644 (file)
--- a/a52/pcm_a52.c
+++ b/a52/pcm_a52.c
@@ -192,24 +192,24 @@ static int convert_data(struct a52_ctx *rec)
 /* write pending encoded data to the slave pcm */
 static int write_out_pending(snd_pcm_ioplug_t *io, struct a52_ctx *rec)
 {
-       int err, ofs = (rec->avctx->frame_size - rec->remain) * 4;
+       snd_pcm_sframes_t ret;
+       unsigned int ofs;
 
        if (! rec->remain)
                return 0;
 
        while (rec->remain) {
-               err = snd_pcm_writei(rec->slave, rec->outbuf + ofs, rec->remain);
-               if (err < 0) {
-                       if (err == -EPIPE)
+               ofs = (rec->avctx->frame_size - rec->remain) * 4;
+               ret = snd_pcm_writei(rec->slave, rec->outbuf + ofs, rec->remain);
+               if (ret < 0) {
+                       if (ret == -EPIPE)
                                io->state = SND_PCM_STATE_XRUN;
-                       if (err == -EAGAIN)
+                       if (ret == -EAGAIN)
                                break;
-                       return err;
-               } else if (! err)
+                       return ret;
+               } else if (! ret)
                        break;
-               if (err < rec->remain)
-                       ofs += (rec->remain - err) * 4;
-               rec->remain -= err;
+               rec->remain -= ret;
        }
        return 0;
 }