Merge remote-tracking branch 'asoc/topic/core' into asoc-next

2 files changed, 3 insertions, 3 deletions

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index a680f23a04fb..e30a00c14196 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -53,7 +53,7 @@ struct snd_compr_stream;
  * Specifies whether the DAI can also support inverted clocks for the specified
  * format.
  */
-#define SND_SOC_DAIFMT_NB_NF            (1 << 8) /* normal bit clock + frame */
+#define SND_SOC_DAIFMT_NB_NF            (0 << 8) /* normal bit clock + frame */
 #define SND_SOC_DAIFMT_NB_IF            (2 << 8) /* normal BCLK + inv FRM */
 #define SND_SOC_DAIFMT_IB_NF            (3 << 8) /* invert BCLK + nor FRM */
 #define SND_SOC_DAIFMT_IB_IF            (4 << 8) /* invert BCLK + FRM */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index bc56738cb109..c76d0242c2a8 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -906,8 +906,8 @@ struct snd_soc_dai_link {
                         struct snd_pcm_hw_params *params);
 
         /* machine stream operations */
-        struct snd_soc_ops *ops;
-        struct snd_soc_compr_ops *compr_ops;
+        const struct snd_soc_ops *ops;
+        const struct snd_soc_compr_ops *compr_ops;
 };
 
 struct snd_soc_codec_conf {