diff for duplicates of <20161228110636.GA14768@ubuntu> diff --git a/a/1.txt b/N1/1.txt index 12fb723..2117c53 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,23 +11,23 @@ index ca6f6b1..4fbb7a2 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -317,7 +317,8 @@ MODULE_DEVICE_TABLE(of, fsl_ssi_ids); - +=20 static bool fsl_ssi_is_ac97(struct fsl_ssi_private *ssi_private) { - return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97); -+ return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97) == ++ return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97) =3D=3D + SND_SOC_DAIFMT_AC97; } - +=20 static bool fsl_ssi_is_i2s_master(struct fsl_ssi_private *ssi_private) @@ -1016,7 +1017,7 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, CCSR_SSI_SCR_TCH_EN); } - +=20 - if (fmt & SND_SOC_DAIFMT_AC97) -+ if ((fmt & SND_SOC_DAIFMT_AC97) == SND_SOC_DAIFMT_AC97) ++ if ((fmt & SND_SOC_DAIFMT_AC97) =3D=3D SND_SOC_DAIFMT_AC97) fsl_ssi_setup_ac97(ssi_private); - +=20 return 0; --- +--=20 2.7.4 diff --git a/a/content_digest b/N1/content_digest index 187c5ab..48c92d7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -26,25 +26,25 @@ "--- a/sound/soc/fsl/fsl_ssi.c\n" "+++ b/sound/soc/fsl/fsl_ssi.c\n" "@@ -317,7 +317,8 @@ MODULE_DEVICE_TABLE(of, fsl_ssi_ids);\n" - " \n" + "=20\n" " static bool fsl_ssi_is_ac97(struct fsl_ssi_private *ssi_private)\n" " {\n" "-\treturn !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97);\n" - "+\treturn !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97) ==\n" + "+\treturn !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97) =3D=3D\n" "+\t\tSND_SOC_DAIFMT_AC97;\n" " }\n" - " \n" + "=20\n" " static bool fsl_ssi_is_i2s_master(struct fsl_ssi_private *ssi_private)\n" "@@ -1016,7 +1017,7 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev,\n" " \t\t\t\tCCSR_SSI_SCR_TCH_EN);\n" " \t}\n" - " \n" + "=20\n" "-\tif (fmt & SND_SOC_DAIFMT_AC97)\n" - "+\tif ((fmt & SND_SOC_DAIFMT_AC97) == SND_SOC_DAIFMT_AC97)\n" + "+\tif ((fmt & SND_SOC_DAIFMT_AC97) =3D=3D SND_SOC_DAIFMT_AC97)\n" " \t\tfsl_ssi_setup_ac97(ssi_private);\n" - " \n" + "=20\n" " \treturn 0;\n" - "-- \n" + "--=20\n" 2.7.4 -19f910eaefc066f7860157799d00c3367df5b1350982ef76edd3b77090588f90 +bf7c7818722177373bfac788964acd6ab20625a6ef7bda9092eed205dc922b36
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.