diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:24:20 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:24:20 +0100 |
| commit | 230b4b376e6b860275dccb1c00e7c213ed7fe311 (patch) | |
| tree | 784dcff11a02732a1c78cc245297d83ccb2f7e37 /drivers/devfreq/devfreq.c | |
| parent | Merge branch 'powercap' (diff) | |
| parent | Merge back earlier devfreq material for v3.13. (diff) | |
| download | linux-230b4b376e6b860275dccb1c00e7c213ed7fe311.tar.xz linux-230b4b376e6b860275dccb1c00e7c213ed7fe311.zip | |
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
Diffstat (limited to 'drivers/devfreq/devfreq.c')
| -rw-r--r-- | drivers/devfreq/devfreq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 2e23b12c350b..a0b2f7e0eedb 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -993,10 +993,10 @@ static int __init devfreq_init(void) } devfreq_wq = create_freezable_workqueue("devfreq_wq"); - if (IS_ERR(devfreq_wq)) { + if (!devfreq_wq) { class_destroy(devfreq_class); pr_err("%s: couldn't create workqueue\n", __FILE__); - return PTR_ERR(devfreq_wq); + return -ENOMEM; } devfreq_class->dev_groups = devfreq_groups; |