Odd no-op in sound/pci/hda/patch_sigmatel.c

Commit Message

Takashi Iwai Jan. 5, 2015, 12:27 p.m. UTC

At Mon, 05 Jan 2015 13:21:17 +0100,
Rasmus Villemoes wrote:
> 
> Hi Takashi
> 
> The "spec->gpio_mask &= spec->gpio_mask" on line 571 of
> sound/pci/hda/patch_sigmatel.c is obviously a no-op. Is that on purpose,
> or was it supposed to be something else?

It's obviously a copy&paste error.  The correct code would be:


I'll fix this with your reported-by credit.


thanks,

Takashi

Patch

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 4f6413e01c13..605d14003d25 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -568,9 +568,9 @@  static void stac_store_hints(struct hda_codec *codec)
 			spec->gpio_mask;
 	}
 	if (get_int_hint(codec, "gpio_dir", &spec->gpio_dir))
-		spec->gpio_mask &= spec->gpio_mask;
-	if (get_int_hint(codec, "gpio_data", &spec->gpio_data))
 		spec->gpio_dir &= spec->gpio_mask;
+	if (get_int_hint(codec, "gpio_data", &spec->gpio_data))
+		spec->gpio_data &= spec->gpio_mask;
 	if (get_int_hint(codec, "eapd_mask", &spec->eapd_mask))
 		spec->eapd_mask &= spec->gpio_mask;
 	if (get_int_hint(codec, "gpio_mute", &spec->gpio_mute))