Message ID | 1443078892-4417-1-git-send-email-oliver+list@schinagl.nl |
---|---|
State | New |
Headers | show |
On Thu, Sep 24, 2015 at 4:14 PM, Olliver Schinagl <oliver+list@schinagl.nl> wrote: > From: Olliver Schinagl <oliver@schinagl.nl> > > Just a very small cosmetical indentation fix, no code changes You are adding two lines and not removing any, so it is not just a cosmetic fix and actually adds code. > > Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> > --- > drivers/gpio/gpiolib.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c > index 980c1f8..5ef9ac2 100644 > --- a/drivers/gpio/gpiolib.c > +++ b/drivers/gpio/gpiolib.c > @@ -1746,6 +1746,8 @@ static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id, > if (con_id && strcmp(con_id, "gpios")) { > snprintf(propname, sizeof(propname), "%s-%s", > con_id, gpio_suffixes[i]); > + if (!IS_ERR(desc) || (PTR_ERR(desc) == -EPROBE_DEFER)) > + break; > } else { > snprintf(propname, sizeof(propname), "%s", > gpio_suffixes[i]); > -- > 2.5.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Appologies! I should not do this early in the morning. It is indeed a copy/paste fail (and not noticing the missing minus) from the section above i was working on. I'm sorry for the noise! Olliver On 24-09-15 09:17, Alexandre Courbot wrote: > On Thu, Sep 24, 2015 at 4:14 PM, Olliver Schinagl > <oliver+list@schinagl.nl> wrote: >> From: Olliver Schinagl <oliver@schinagl.nl> >> >> Just a very small cosmetical indentation fix, no code changes > You are adding two lines and not removing any, so it is not just a > cosmetic fix and actually adds code. > >> Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> >> --- >> drivers/gpio/gpiolib.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c >> index 980c1f8..5ef9ac2 100644 >> --- a/drivers/gpio/gpiolib.c >> +++ b/drivers/gpio/gpiolib.c >> @@ -1746,6 +1746,8 @@ static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id, >> if (con_id && strcmp(con_id, "gpios")) { >> snprintf(propname, sizeof(propname), "%s-%s", >> con_id, gpio_suffixes[i]); >> + if (!IS_ERR(desc) || (PTR_ERR(desc) == -EPROBE_DEFER)) >> + break; >> } else { >> snprintf(propname, sizeof(propname), "%s", >> gpio_suffixes[i]); >> -- >> 2.5.1 >> -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 980c1f8..5ef9ac2 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1746,6 +1746,8 @@ static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id, if (con_id && strcmp(con_id, "gpios")) { snprintf(propname, sizeof(propname), "%s-%s", con_id, gpio_suffixes[i]); + if (!IS_ERR(desc) || (PTR_ERR(desc) == -EPROBE_DEFER)) + break; } else { snprintf(propname, sizeof(propname), "%s", gpio_suffixes[i]);