diff for duplicates of <1811469.aLo43mdTt2@avalon> diff --git a/a/1.txt b/N1/1.txt index 5db1ae9..752d822 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,13 +71,13 @@ index 5c25fa1..2fdd019 100644 + ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0, &args); - p->config.number_of_pins = ret == 0 ? args.args[2] + p->config.number_of_pins = ret = 0 ? args.args[2] : RCAR_MAX_GPIO_PER_BANK; p->config.gpio_base = -1; + p->config.has_both_edge_trigger = info->has_both_edge_trigger; } - if (p->config.number_of_pins == 0 || + if (p->config.number_of_pins = 0 || @@ -308,6 +345,8 @@ static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p) p->config.number_of_pins, RCAR_MAX_GPIO_PER_BANK); p->config.number_of_pins = RCAR_MAX_GPIO_PER_BANK; diff --git a/a/content_digest b/N1/content_digest index 7925508..29c2077 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\0" "Subject\0[PATCH RESEND] gpio: rcar: Support both edge trigger with DT\0" - "Date\0Fri, 29 Nov 2013 14:48 +0100\0" + "Date\0Fri, 29 Nov 2013 13:48:00 +0000\0" "To\0linux-sh@vger.kernel.org\0" "Cc\0linux-gpio@vger.kernel.org" Linus Walleij <linus.walleij@linaro.org> @@ -80,13 +80,13 @@ "+\n" " \t\tret = of_parse_phandle_with_fixed_args(np, \"gpio-ranges\", 3, 0,\n" " \t\t\t\t\t\t &args);\n" - " \t\tp->config.number_of_pins = ret == 0 ? args.args[2]\n" + " \t\tp->config.number_of_pins = ret = 0 ? args.args[2]\n" " \t\t\t\t\t : RCAR_MAX_GPIO_PER_BANK;\n" " \t\tp->config.gpio_base = -1;\n" "+\t\tp->config.has_both_edge_trigger = info->has_both_edge_trigger;\n" " \t}\n" " \n" - " \tif (p->config.number_of_pins == 0 ||\n" + " \tif (p->config.number_of_pins = 0 ||\n" "@@ -308,6 +345,8 @@ static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p)\n" " \t\t\t p->config.number_of_pins, RCAR_MAX_GPIO_PER_BANK);\n" " \t\tp->config.number_of_pins = RCAR_MAX_GPIO_PER_BANK;\n" @@ -130,4 +130,4 @@ "\n" Laurent Pinchart -ad5f9422fafc9f02aeae1b9836a039c36c716fbb540ee08ac20bc36db6072e36 +9ec32f123c456829a238dcddbb9660ee6575aa3ba6c21a3442c142ddaf1a4845
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.