diff --git a/[refs] b/[refs] index 2e61eb7925ef..a99258310de7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f82b6cf76516063fe26dac15e93544387c681eb +refs/heads/master: dcf701125eefea6baf72753533cb8b60fb0e3934 diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index 9fafa00b8cd4..10fb252323fb 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -2941,6 +2941,7 @@ regulator_register(const struct regulator_desc *regulator_desc, return ERR_PTR(-EINVAL); dev = config->dev; + WARN_ON(!dev); if (regulator_desc->name == NULL || regulator_desc->ops == NULL) return ERR_PTR(-EINVAL);