diff --git a/[refs] b/[refs] index 4f52e2041eda..8a2a467625e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e76ab829cc2d8b6350a3f01fffb208df4d7d8c1b +refs/heads/master: b2a1ef473b031b630a26685c91a46b9ae668d35c diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index f092588a078c..48385318175a 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -3217,7 +3217,7 @@ regulator_register(const struct regulator_desc *regulator_desc, dev_set_drvdata(&rdev->dev, rdev); - if (config->ena_gpio) { + if (config->ena_gpio && gpio_is_valid(config->ena_gpio)) { ret = gpio_request_one(config->ena_gpio, GPIOF_DIR_OUT | config->ena_gpio_flags, rdev_get_name(rdev));