Felipe Balbi <balbi@xxxxxx> writes: > diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c > index 9a826ff31951..34231c31cd1a 100644 > --- a/drivers/usb/phy/phy-generic.c > +++ b/drivers/usb/phy/phy-generic.c > @@ -219,11 +219,11 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop, > > needs_vcc = of_property_read_bool(node, "vcc-supply"); > nop->gpiod_reset = devm_gpiod_get_optional(dev, "reset-gpios"); > - err = PTR_ERR(nop->gpiod_reset); > + err = PTR_ERR_OR_ZERO(nop->gpiod_reset); > if (!err) { > nop->gpiod_vbus = devm_gpiod_get_optional(dev, > "vbus-detect-gpio"); > - err = PTR_ERR(nop->gpiod_vbus); > + err = PTR_ERR_OR_ZERO(nop->gpiod_vbus); > } > } else if (pdata) { > type = pdata->type; Funny, we ended up on the same solution ... almost, I add the "reset-gpios" into "reset" and "vbus-detect-gpio" into "vbus-detect" also. But it's a good sign we've ended up on the same code, isn't it ;) ? Do you want me to rebase on your next tree and submit ? Or do you want to submit the patch yourself ? Cheers. -- Robert -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html