diff for duplicates of <20150518165015.GA19708@dtor-ws> diff --git a/a/1.txt b/N1/1.txt index 990792a..4ab6be4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -187,7 +187,7 @@ changelog. > /* The "Cancel/ESC" key is labeled "On/Off" on > * Collie and Poodle and should suspend the device > * if it was pressed for more than a second. */ -> - if (unlikely(key == KEY_ESC)) { +> - if (unlikely(key = KEY_ESC)) { > - if (!time_after(jiffies, > - locomokbd->suspend_jiffies + HZ)) > - continue; @@ -199,7 +199,7 @@ changelog. > - locomokbd->suspend_jiffies = jiffies; > - } else > - locomokbd->count_cancel = 0; -> + if (unlikely(key == KEY_ESC)) +> + if (unlikely(key = KEY_ESC)) > + esc_pressed = true; > } > - locomokbd_reset_col(membase, col); @@ -240,7 +240,7 @@ changelog. > > - r = locomo_readl(locomokbd->base + LOCOMO_KIC); > + regmap_read(locomokbd->regmap, LOCOMO_KIC, &r); -> if ((r & 0x0001) == 0) +> if ((r & 0x0001) = 0) > return IRQ_HANDLED; > > - locomo_writel(r & ~0x0100, locomokbd->base + LOCOMO_KIC); /* Ack */ diff --git a/a/content_digest b/N1/content_digest index 6105134..1d74edd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01431880077-26321-4-git-send-email-dbaryshkov@gmail.com\0" "From\0Dmitry Torokhov <dmitry.torokhov@gmail.com>\0" "Subject\0Re: [PATCH v3 03/17] input: convert LoCoMo keyboard driver to use new locomo core\0" - "Date\0Mon, 18 May 2015 09:50:15 -0700\0" + "Date\0Mon, 18 May 2015 16:50:15 +0000\0" "To\0Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>\0" "Cc\0Russell King <linux@arm.linux.org.uk>" Daniel Mack <daniel@zonque.org> @@ -218,7 +218,7 @@ "> \t\t\t/* The \"Cancel/ESC\" key is labeled \"On/Off\" on\n" "> \t\t\t * Collie and Poodle and should suspend the device\n" "> \t\t\t * if it was pressed for more than a second. */\n" - "> -\t\t\tif (unlikely(key == KEY_ESC)) {\n" + "> -\t\t\tif (unlikely(key = KEY_ESC)) {\n" "> -\t\t\t\tif (!time_after(jiffies,\n" "> -\t\t\t\t\tlocomokbd->suspend_jiffies + HZ))\n" "> -\t\t\t\t\tcontinue;\n" @@ -230,7 +230,7 @@ "> -\t\t\t\tlocomokbd->suspend_jiffies = jiffies;\n" "> -\t\t\t} else\n" "> -\t\t\t\tlocomokbd->count_cancel = 0;\n" - "> +\t\t\tif (unlikely(key == KEY_ESC))\n" + "> +\t\t\tif (unlikely(key = KEY_ESC))\n" "> +\t\t\t\tesc_pressed = true;\n" "> \t\t}\n" "> -\t\tlocomokbd_reset_col(membase, col);\n" @@ -271,7 +271,7 @@ "> \n" "> -\tr = locomo_readl(locomokbd->base + LOCOMO_KIC);\n" "> +\tregmap_read(locomokbd->regmap, LOCOMO_KIC, &r);\n" - "> \tif ((r & 0x0001) == 0)\n" + "> \tif ((r & 0x0001) = 0)\n" "> \t\treturn IRQ_HANDLED;\n" "> \n" "> -\tlocomo_writel(r & ~0x0100, locomokbd->base + LOCOMO_KIC); /* Ack */\n" @@ -507,4 +507,4 @@ "-- \n" Dmitry -7909df5fc7dcd9f0f83aa6856009f7a0a194893df1a1acd919bf46dc7ab368fd +4877d99cac16a949e8815c1fab1ff1a920ceae6b9a96662ce2c3885ea7626847
diff --git a/a/content_digest b/N2/content_digest index 6105134..46399ba 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,32 +1,9 @@ "ref\01431880077-26321-1-git-send-email-dbaryshkov@gmail.com\0" "ref\01431880077-26321-4-git-send-email-dbaryshkov@gmail.com\0" - "From\0Dmitry Torokhov <dmitry.torokhov@gmail.com>\0" - "Subject\0Re: [PATCH v3 03/17] input: convert LoCoMo keyboard driver to use new locomo core\0" + "From\0dmitry.torokhov@gmail.com (Dmitry Torokhov)\0" + "Subject\0[PATCH v3 03/17] input: convert LoCoMo keyboard driver to use new locomo core\0" "Date\0Mon, 18 May 2015 09:50:15 -0700\0" - "To\0Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>\0" - "Cc\0Russell King <linux@arm.linux.org.uk>" - Daniel Mack <daniel@zonque.org> - Robert Jarzmik <robert.jarzmik@free.fr> - Linus Walleij <linus.walleij@linaro.org> - Alexandre Courbot <gnurou@gmail.com> - Wolfram Sang <wsa@the-dreams.de> - Bryan Wu <cooloney@gmail.com> - Richard Purdie <rpurdie@rpsys.net> - Samuel Ortiz <sameo@linux.intel.com> - Lee Jones <lee.jones@linaro.org> - Mark Brown <broonie@kernel.org> - Jingoo Han <jg1.han@samsung.com> - Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> - Tomi Valkeinen <tomi.valkeinen@ti.com> - Liam Girdwood <lgirdwood@gmail.com> - Andrea Adami <andrea.adami@gmail.com> - linux-arm-kernel@lists.infradead.org - linux-gpio@vger.kernel.org - linux-input@vger.kernel.org - linux-leds@vger.kernel.org - linux-spi@vger.kernel.org - linux-fbdev@vger.kernel.org - " alsa-devel@alsa-project.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Sun, May 17, 2015 at 07:27:43PM +0300, Dmitry Eremin-Solenikov wrote:\n" @@ -507,4 +484,4 @@ "-- \n" Dmitry -7909df5fc7dcd9f0f83aa6856009f7a0a194893df1a1acd919bf46dc7ab368fd +f07122af26ccd6f156d1d23f5f2061c1700f7d5b27f3a6e934f3ec812dd0a47a
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.