Merge branch 'v4.4/topic/OPPv2' into linux-linaro-lsk-v4.4

This commit is contained in:
Alex Shi 2017-03-24 11:26:58 +08:00
commit f74e7b0c9a

View File

@ -259,9 +259,6 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)
reg = opp_table->regulator;
if (IS_ERR(reg)) {
/* Regulator may not be required for device */
if (reg)
dev_err(dev, "%s: Invalid regulator (%ld)\n", __func__,
PTR_ERR(reg));
rcu_read_unlock();
return 0;
}