diff for duplicates of <def3f975-9579-c2fe-9411-fb7522dd46a9@secunet.com>
diff --git a/a/1.txt b/N1/1.txt
index f0bdd02..3985694 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -35,7 +35,7 @@ index f0955fd..0d98624 100644
static bool is_thinkpad(struct hda_codec *codec)
{
-+ return (codec->core.subsystem_id >> 16 == 0x17aa);
++ return (codec->core.subsystem_id >> 16 = 0x17aa);
+}
+
+static bool is_thinkpad_acpi(struct hda_codec *codec)
@@ -72,7 +72,7 @@ index f0955fd..0d98624 100644
- if (!ucontrol || !led_set_func)
+ if (!ucontrol)
return;
- if (strcmp("Capture Switch", ucontrol->id.name) == 0 && ucontrol->id.index == 0) {
+ if (strcmp("Capture Switch", ucontrol->id.name) = 0 && ucontrol->id.index = 0) {
/* TODO: How do I verify if it's a mono or stereo here? */
bool val = ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1];
- led_set_func(TPACPI_LED_MICMUTE, !val);
@@ -96,7 +96,7 @@ index f0955fd..0d98624 100644
- bool removefunc = false;
+ int ret = -ENXIO;
-- if (action == HDA_FIXUP_ACT_PROBE) {
+- if (action = HDA_FIXUP_ACT_PROBE) {
- if (!is_thinkpad(codec))
- return;
- if (!led_set_func)
@@ -148,7 +148,7 @@ index f0955fd..0d98624 100644
}
}
-- if (led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) {
+- if (led_set_func && (action = HDA_FIXUP_ACT_FREE || removefunc)) {
+ return ret;
+}
+
@@ -156,12 +156,12 @@ index f0955fd..0d98624 100644
+{
+ int ret = 0;
+
-+ if (action == HDA_FIXUP_ACT_PROBE) {
++ if (action = HDA_FIXUP_ACT_PROBE) {
+ ret = hda_fixup_thinkpad_acpi_prepare(codec);
+ }
+
+ if (led_set_func_tpacpi &&
-+ (action == HDA_FIXUP_ACT_FREE || ret)) {
++ (action = HDA_FIXUP_ACT_FREE || ret)) {
+
symbol_put(tpacpi_led_set);
- led_set_func = NULL;
@@ -212,12 +212,12 @@ index f0955fd..0d98624 100644
+{
+ int ret = 0;
+
-+ if (action == HDA_FIXUP_ACT_PROBE) {
++ if (action = HDA_FIXUP_ACT_PROBE) {
+ ret = hda_fixup_thinkpad_hid_prepare(codec);
+ }
+
+ if (led_set_func_hid_lenovo &&
-+ (action == HDA_FIXUP_ACT_FREE || ret)) {
++ (action = HDA_FIXUP_ACT_FREE || ret)) {
+
+ symbol_put(hid_lenovo_led_set);
+ led_set_func_hid_lenovo = NULL;
diff --git a/a/content_digest b/N1/content_digest
index 5a2f80c..b952340 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,3 +1,6 @@
+[
+ "ref\00091729b41-7537-b506-6980-94b9938c8305\@secunet.com\0"
+]
[
"From\0Dennis Wassenberg <dennis.wassenberg\@secunet.com>\0"
]
@@ -5,7 +8,7 @@
"Subject\0[PATCH 4/4] hda: thinkpad_helper: Add support for hid-lenovo LED control\0"
]
[
- "Date\0Fri, 9 Dec 2016 16:06:20 +0100\0"
+ "Date\0Fri, 09 Dec 2016 15:06:20 +0000\0"
]
[
"To\0linux-input\@vger.kernel.org",
@@ -65,7 +68,7 @@
" \n",
" static bool is_thinkpad(struct hda_codec *codec)\n",
" {\n",
- "+\treturn (codec->core.subsystem_id >> 16 == 0x17aa);\n",
+ "+\treturn (codec->core.subsystem_id >> 16 = 0x17aa);\n",
"+}\n",
"+\n",
"+static bool is_thinkpad_acpi(struct hda_codec *codec)\n",
@@ -102,7 +105,7 @@
"-\tif (!ucontrol || !led_set_func)\n",
"+\tif (!ucontrol)\n",
" \t\treturn;\n",
- " \tif (strcmp(\"Capture Switch\", ucontrol->id.name) == 0 && ucontrol->id.index == 0) {\n",
+ " \tif (strcmp(\"Capture Switch\", ucontrol->id.name) = 0 && ucontrol->id.index = 0) {\n",
" \t\t/* TODO: How do I verify if it's a mono or stereo here? */\n",
" \t\tbool val = ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1];\n",
"-\t\tled_set_func(TPACPI_LED_MICMUTE, !val);\n",
@@ -126,7 +129,7 @@
"-\tbool removefunc = false;\n",
"+\tint ret = -ENXIO;\n",
" \n",
- "-\tif (action == HDA_FIXUP_ACT_PROBE) {\n",
+ "-\tif (action = HDA_FIXUP_ACT_PROBE) {\n",
"-\t\tif (!is_thinkpad(codec))\n",
"-\t\t\treturn;\n",
"-\t\tif (!led_set_func)\n",
@@ -178,7 +181,7 @@
" \t\t}\n",
" \t}\n",
" \n",
- "-\tif (led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) {\n",
+ "-\tif (led_set_func && (action = HDA_FIXUP_ACT_FREE || removefunc)) {\n",
"+\treturn ret;\n",
"+}\n",
"+\n",
@@ -186,12 +189,12 @@
"+{\n",
"+\tint ret = 0;\n",
"+\n",
- "+\tif (action == HDA_FIXUP_ACT_PROBE) {\n",
+ "+\tif (action = HDA_FIXUP_ACT_PROBE) {\n",
"+\t\tret = hda_fixup_thinkpad_acpi_prepare(codec);\n",
"+\t}\n",
"+\n",
"+\tif (led_set_func_tpacpi &&\n",
- "+\t\t(action == HDA_FIXUP_ACT_FREE || ret)) {\n",
+ "+\t\t(action = HDA_FIXUP_ACT_FREE || ret)) {\n",
"+\n",
" \t\tsymbol_put(tpacpi_led_set);\n",
"-\t\tled_set_func = NULL;\n",
@@ -242,12 +245,12 @@
"+{\n",
"+\tint ret = 0;\n",
"+\n",
- "+\tif (action == HDA_FIXUP_ACT_PROBE) {\n",
+ "+\tif (action = HDA_FIXUP_ACT_PROBE) {\n",
"+\t\tret = hda_fixup_thinkpad_hid_prepare(codec);\n",
"+\t}\n",
"+\n",
"+\tif (led_set_func_hid_lenovo &&\n",
- "+\t\t(action == HDA_FIXUP_ACT_FREE || ret)) {\n",
+ "+\t\t(action = HDA_FIXUP_ACT_FREE || ret)) {\n",
"+\n",
"+\t\tsymbol_put(hid_lenovo_led_set);\n",
"+\t\tled_set_func_hid_lenovo = NULL;\n",
@@ -280,4 +283,4 @@
"--"
]
-e787db63d97c9b9ae93608aeea6249969d5949dbc8af84ac9c9b9d1c79667ba7
+953f87d31f36fcd6327f258bc1ee99c5a0700ea976bd023f6e8ce54f30bcf579
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.