diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-30 18:17:13 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-30 18:17:13 +0300 |
| commit | e83ce4a51757cf63970a76090662f636112231a7 (patch) | |
| tree | e1edaf29646eff64a3e94b2be77f7073ed8abb0d /sound/soc/rockchip/rockchip_i2s.h | |
| parent | d6795827bd79b28fef1abdaf7e525fcca506b831 (diff) | |
| parent | f2ec1d3b25776051a9205289dab12e9401d33f8a (diff) | |
| download | linux-e83ce4a51757cf63970a76090662f636112231a7.tar.xz | |
Merge tag 'asoc-fix-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.19
A few fixes for v3.19, a few driver specifics and one core fix which
fixes a boot crash on OMAP if deferred probing kicks in due to
attempting to modify static data.
Diffstat (limited to 'sound/soc/rockchip/rockchip_i2s.h')
| -rw-r--r-- | sound/soc/rockchip/rockchip_i2s.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.h b/sound/soc/rockchip/rockchip_i2s.h index 89a5d8bc6ee7..93f456f518a9 100644 --- a/sound/soc/rockchip/rockchip_i2s.h +++ b/sound/soc/rockchip/rockchip_i2s.h @@ -127,7 +127,7 @@ #define I2S_DMACR_TDE_DISABLE (0 << I2S_DMACR_TDE_SHIFT) #define I2S_DMACR_TDE_ENABLE (1 << I2S_DMACR_TDE_SHIFT) #define I2S_DMACR_TDL_SHIFT 0 -#define I2S_DMACR_TDL(x) ((x - 1) << I2S_DMACR_TDL_SHIFT) +#define I2S_DMACR_TDL(x) ((x) << I2S_DMACR_TDL_SHIFT) #define I2S_DMACR_TDL_MASK (0x1f << I2S_DMACR_TDL_SHIFT) /* |