From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 7 Nov 2013 18:24:20 +0000 (+0100)
Subject: Merge branch 'pm-devfreq'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=230b4b376e6b860275dccb1c00e7c213ed7fe311;p=linux.git

Merge branch 'pm-devfreq'

* pm-devfreq:
  PM / devfreq: create_freezable_workqueue() doesn't return an ERR_PTR
  PM / devfreq: Remove duplicate header file inclusion in exynos5_bus.c
  PM / devfreq: Use devm_* APIs in exynos5_bus.c
  PM / devfreq: Remove redundant platform_set_drvdata() in exynos5_bus.c
  PM / devfreq: Fix incorrect usage of IS_ERR_OR_NULL in exynos5_bus.c
---

230b4b376e6b860275dccb1c00e7c213ed7fe311
diff --cc drivers/devfreq/exynos/exynos5_bus.c
index 0e0bfc17cd5be,04c164eecf253..a60da3c1c48ee
--- a/drivers/devfreq/exynos/exynos5_bus.c
+++ b/drivers/devfreq/exynos/exynos5_bus.c
@@@ -373,11 -371,10 +371,10 @@@ static int exynos5_busfreq_int_probe(st
  		rcu_read_unlock();
  		dev_err(dev, "Invalid initial frequency %lu kHz.\n",
  		       exynos5_devfreq_int_profile.initial_freq);
- 		err = PTR_ERR(opp);
- 		goto err_opp_add;
+ 		return PTR_ERR(opp);
  	}
 -	initial_freq = opp_get_freq(opp);
 -	initial_volt = opp_get_voltage(opp);
 +	initial_freq = dev_pm_opp_get_freq(opp);
 +	initial_volt = dev_pm_opp_get_voltage(opp);
  	rcu_read_unlock();
  	data->curr_freq = initial_freq;