From: Jiang Jiang Jian <jack@espressif.com>
Date: Thu, 17 May 2018 13:53:06 +0000 (+0800)
Subject: Merge branch 'bugfix/i2s_mix_result_with_error_code_master' into 'master'
X-Git-Tag: v3.1-beta1~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf9499479caf35073d9baefee00937e784af1cae;p=esp-idf

Merge branch 'bugfix/i2s_mix_result_with_error_code_master' into 'master'

fix i2s mix result and error code

See merge request idf/esp-idf!2227
---

cf9499479caf35073d9baefee00937e784af1cae