diff options
| author | Mark Brown <broonie@kernel.org> | 2018-10-21 16:59:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-21 16:59:23 +0100 |
| commit | 65dfb6d6dd2850f3f99f08536d2b14190350c854 (patch) | |
| tree | e8b0468b3e4d4d54dbea68c9ffce9fd8648be2aa /sound/soc/fsl/fsl_utils.c | |
| parent | 576b354ac25b544a31f27c365410d59fcbfee064 (diff) | |
| parent | 7f91e2af1a4a2c34fc2e8fb046c722e1a9c85399 (diff) | |
| download | blackbird-obmc-linux-65dfb6d6dd2850f3f99f08536d2b14190350c854.tar.gz blackbird-obmc-linux-65dfb6d6dd2850f3f99f08536d2b14190350c854.zip | |
Merge branch 'asoc-4.20' into asoc-next
Diffstat (limited to 'sound/soc/fsl/fsl_utils.c')
| -rw-r--r-- | sound/soc/fsl/fsl_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_utils.c b/sound/soc/fsl/fsl_utils.c index 7f0fa4b52223..9981668ab590 100644 --- a/sound/soc/fsl/fsl_utils.c +++ b/sound/soc/fsl/fsl_utils.c @@ -57,8 +57,8 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np, of_node_put(dma_channel_np); return ret; } - snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%s", - (unsigned long long) res.start, dma_channel_np->name); + snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%pOFn", + (unsigned long long) res.start, dma_channel_np); iprop = of_get_property(dma_channel_np, "cell-index", NULL); if (!iprop) { |
