diff for duplicates of <6d21581c-cbc6-f148-77fd-2b468335f481@secunet.com>
diff --git a/a/1.txt b/N1/1.txt
index 92b737a..68d94ba 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -52,12 +52,12 @@ On 12.09.2016 14:38, Takashi Iwai wrote:
>>
>> 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)
>> +{
->> return (codec->core.subsystem_id >> 16 == 0x17aa) &&
+>> return (codec->core.subsystem_id >> 16 = 0x17aa) &&
>> (acpi_dev_found("LEN0068") || acpi_dev_found("IBM0068"));
>> }
>>
@@ -86,7 +86,7 @@ On 12.09.2016 14:38, Takashi Iwai wrote:
>> - 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);
@@ -105,7 +105,7 @@ On 12.09.2016 14:38, Takashi Iwai wrote:
>> - 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)
@@ -163,7 +163,7 @@ On 12.09.2016 14:38, Takashi Iwai wrote:
>> }
>> }
>>
->> - if (led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) {
+>> - if (led_set_func && (action = HDA_FIXUP_ACT_FREE || removefunc)) {
>> + return ret;
>> +}
>> +
@@ -209,7 +209,7 @@ On 12.09.2016 14:38, Takashi Iwai wrote:
>> + int ret_fixup_hid = 0;
>> + bool remove = 0;
>> +
->> + if (action == HDA_FIXUP_ACT_PROBE) {
+>> + if (action = HDA_FIXUP_ACT_PROBE) {
>> + ret_fixup_acpi = hda_fixup_thinkpad_acpi(codec);
>> + ret_fixup_hid = hda_fixup_thinkpad_hid(codec);
>
@@ -219,7 +219,7 @@ On 12.09.2016 14:38, Takashi Iwai wrote:
>> + }
>> +
>> + if (led_set_func_tpacpi &&
->> + (action == HDA_FIXUP_ACT_FREE || ret_fixup_acpi)) {
+>> + (action = HDA_FIXUP_ACT_FREE || ret_fixup_acpi)) {
>> +
>> symbol_put(tpacpi_led_set);
>> - led_set_func = NULL;
@@ -227,7 +227,7 @@ On 12.09.2016 14:38, Takashi Iwai wrote:
>> + }
>> +
>> + if (led_set_func_hid_lenovo &&
->> + (action == HDA_FIXUP_ACT_FREE || ret_fixup_hid)) {
+>> + (action = HDA_FIXUP_ACT_FREE || ret_fixup_hid)) {
>> +
>> + symbol_put(hid_lenovo_led_set);
>> + remove = true;
diff --git a/a/content_digest b/N1/content_digest
index 834e39a..8accb42 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -11,7 +11,7 @@
"Subject\0Re: [PATCH 4/4] hda: thinkpad_helper: Add support for hid-lenovo LED control\0"
]
[
- "Date\0Wed, 14 Sep 2016 08:22:45 +0200\0"
+ "Date\0Wed, 14 Sep 2016 06:22:45 +0000\0"
]
[
"To\0Takashi Iwai <tiwai\@suse.de>\0"
@@ -91,12 +91,12 @@
">> \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",
">> +{\n",
- ">> \treturn (codec->core.subsystem_id >> 16 == 0x17aa) &&\n",
+ ">> \treturn (codec->core.subsystem_id >> 16 = 0x17aa) &&\n",
">> \t (acpi_dev_found(\"LEN0068\") || acpi_dev_found(\"IBM0068\"));\n",
">> }\n",
">> \n",
@@ -125,7 +125,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",
@@ -144,7 +144,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",
@@ -202,7 +202,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",
@@ -248,7 +248,7 @@
">> +\tint ret_fixup_hid = 0;\n",
">> +\tbool remove = 0;\n",
">> +\n",
- ">> +\tif (action == HDA_FIXUP_ACT_PROBE) {\n",
+ ">> +\tif (action = HDA_FIXUP_ACT_PROBE) {\n",
">> +\t\tret_fixup_acpi = hda_fixup_thinkpad_acpi(codec);\n",
">> +\t\tret_fixup_hid = hda_fixup_thinkpad_hid(codec);\n",
"> \n",
@@ -258,7 +258,7 @@
">> +\t}\n",
">> +\n",
">> +\tif (led_set_func_tpacpi &&\n",
- ">> +\t\t(action == HDA_FIXUP_ACT_FREE || ret_fixup_acpi)) {\n",
+ ">> +\t\t(action = HDA_FIXUP_ACT_FREE || ret_fixup_acpi)) {\n",
">> +\n",
">> \t\tsymbol_put(tpacpi_led_set);\n",
">> -\t\tled_set_func = NULL;\n",
@@ -266,7 +266,7 @@
">> +\t}\n",
">> +\n",
">> +\tif (led_set_func_hid_lenovo &&\n",
- ">> +\t\t(action == HDA_FIXUP_ACT_FREE || ret_fixup_hid)) {\n",
+ ">> +\t\t(action = HDA_FIXUP_ACT_FREE || ret_fixup_hid)) {\n",
">> +\n",
">> +\t\tsymbol_put(hid_lenovo_led_set);\n",
">> +\t\tremove = true;\n",
@@ -294,4 +294,4 @@
">"
]
-73deefae73e64253d5994e7a93e03fd88f30c0fe85ceb36f3a5cc2e83294d792
+9fd303f21653dea8658603fedc55fe5df5439d736a85f5f4eb80dab01522b29b
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.