Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

This commit is contained in:
Mark Brown 2014-02-23 12:22:18 +09:00
commit f29d778fa4

View File

@ -1359,7 +1359,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
goto found; goto found;
/* Don't log an error when called from regulator_get_optional() */ /* Don't log an error when called from regulator_get_optional() */
} else if (!have_full_constraints() || exclusive) { } else if (!have_full_constraints() || exclusive) {
dev_err(dev, "dummy supplies not allowed\n"); dev_warn(dev, "dummy supplies not allowed\n");
} }
mutex_unlock(&regulator_list_mutex); mutex_unlock(&regulator_list_mutex);