diff for duplicates of <1263897964.3089.54.camel@odin> diff --git a/a/1.txt b/N1/1.txt index 7801a40..8816ff3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -490,7 +490,7 @@ I would personally not put the extra { here > + struct wm8978_pll_div pll_div; > + u16 reg; > + -> + if (freq_in == 0 || freq_out == 0) { +> + if (freq_in = 0 || freq_out = 0) { > + /* Clock CODEC directly from MCLK */ > + reg = snd_soc_read(codec, WM8978_CLOCKING); > + snd_soc_write(codec, WM8978_CLOCKING, reg & ~0x100); @@ -726,7 +726,7 @@ Power stuff should be in either dapm or bias functions. > + case SND_SOC_BIAS_STANDBY: > + power1 |= 0xC; > + -> + if (codec->bias_level == SND_SOC_BIAS_OFF) { +> + if (codec->bias_level = SND_SOC_BIAS_OFF) { > + /* Initial cap charge at VMID 5k */ > + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, > + power1 | 0x3); @@ -813,7 +813,7 @@ Power stuff should be in either dapm or bias functions. > + > + /* Sync reg_cache with the hardware */ > + for (i = 0; i < ARRAY_SIZE(wm8978_reg); i++) { -> + if (i == WM8978_RESET) +> + if (i = WM8978_RESET) > + continue; > + data = cpu_to_be16((i << 9) | (cache[i] & 0x1ff)); > + codec->hw_write(codec->control_data, (char *)&data, 2); @@ -829,7 +829,7 @@ Power stuff should be in either dapm or bias functions. > + struct snd_soc_codec *codec; > + int ret = 0; > + -> + if (wm8978_codec == NULL) { +> + if (wm8978_codec = NULL) { > + dev_err(&pdev->dev, "Codec device not registered\n"); > + return -ENODEV; > + } @@ -953,7 +953,7 @@ Power stuff should be in either dapm or bias functions. > + struct snd_soc_codec *codec; > + > + wm8978 = kzalloc(sizeof(struct wm8978_priv), GFP_KERNEL); -> + if (wm8978 == NULL) +> + if (wm8978 = NULL) > + return -ENOMEM; > + > + codec = &wm8978->codec; diff --git a/a/content_digest b/N1/content_digest index 5527133..97964c2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -503,7 +503,7 @@ "> +\tstruct wm8978_pll_div pll_div;\n" "> +\tu16 reg;\n" "> +\n" - "> +\tif (freq_in == 0 || freq_out == 0) {\n" + "> +\tif (freq_in = 0 || freq_out = 0) {\n" "> +\t\t/* Clock CODEC directly from MCLK */\n" "> +\t\treg = snd_soc_read(codec, WM8978_CLOCKING);\n" "> +\t\tsnd_soc_write(codec, WM8978_CLOCKING, reg & ~0x100);\n" @@ -739,7 +739,7 @@ "> +\tcase SND_SOC_BIAS_STANDBY:\n" "> +\t\tpower1 |= 0xC;\n" "> +\n" - "> +\t\tif (codec->bias_level == SND_SOC_BIAS_OFF) {\n" + "> +\t\tif (codec->bias_level = SND_SOC_BIAS_OFF) {\n" "> +\t\t\t/* Initial cap charge at VMID 5k */\n" "> +\t\t\tsnd_soc_write(codec, WM8978_POWER_MANAGEMENT_1,\n" "> +\t\t\t\t power1 | 0x3);\n" @@ -826,7 +826,7 @@ "> +\n" "> +\t/* Sync reg_cache with the hardware */\n" "> +\tfor (i = 0; i < ARRAY_SIZE(wm8978_reg); i++) {\n" - "> +\t\tif (i == WM8978_RESET)\n" + "> +\t\tif (i = WM8978_RESET)\n" "> +\t\t\tcontinue;\n" "> +\t\tdata = cpu_to_be16((i << 9) | (cache[i] & 0x1ff));\n" "> +\t\tcodec->hw_write(codec->control_data, (char *)&data, 2);\n" @@ -842,7 +842,7 @@ "> +\tstruct snd_soc_codec *codec;\n" "> +\tint ret = 0;\n" "> +\n" - "> +\tif (wm8978_codec == NULL) {\n" + "> +\tif (wm8978_codec = NULL) {\n" "> +\t\tdev_err(&pdev->dev, \"Codec device not registered\\n\");\n" "> +\t\treturn -ENODEV;\n" "> +\t}\n" @@ -966,7 +966,7 @@ "> +\tstruct snd_soc_codec *codec;\n" "> +\n" "> +\twm8978 = kzalloc(sizeof(struct wm8978_priv), GFP_KERNEL);\n" - "> +\tif (wm8978 == NULL)\n" + "> +\tif (wm8978 = NULL)\n" "> +\t\treturn -ENOMEM;\n" "> +\n" "> +\tcodec = &wm8978->codec;\n" @@ -1113,4 +1113,4 @@ "> +\n" "> +#endif\t/* __WM8978_H__ */" -6039ef9963cdc935e26ade344a4a9cfd93a790d9ccf8ede3bc5a433e5eb793a8 +31dac3503e231baf69fa579adde6f707fa74b6e5d6723c233d074abeebf7f504
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.