diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-05 14:57:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-05 14:57:46 +1100 |
| commit | 57bb8587a072c8f76d8f1b1807a78add5ce0f292 (patch) | |
| tree | dd0abb5a545cd4f2c4ff3fdf2449f2d413d058b9 /sound/soc/amd | |
| parent | fe852b0df2ff1e5980e23b71bb08edd55e2b517e (diff) | |
| parent | 4453f4fde106d53de1d8532684871b47fc735ec6 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'sound/soc/amd')
| -rw-r--r-- | sound/soc/amd/acp-pcm-dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 504c7cd7f58a..79a7064ed1f1 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -89,7 +89,7 @@ static void acp_reg_write(u32 val, void __iomem *acp_mmio, u32 reg) writel(val, acp_mmio + (reg * 4)); } -/* Configure a given dma channel parameters - enable/disble, +/* Configure a given dma channel parameters - enable/disable, * number of descriptors, priority */ static void config_acp_dma_channel(void __iomem *acp_mmio, u8 ch_num, @@ -506,7 +506,7 @@ static int acp_init(void __iomem *acp_mmio) return 0; } -/* Deintialize ACP */ +/* Deinitialize ACP */ static int acp_deinit(void __iomem *acp_mmio) { u32 val; |