diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-30 01:37:02 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-30 01:37:02 +0100 |
| commit | 689e437076283837172248365cec54c5717f7b5d (patch) | |
| tree | fcbcd88bf24dd310bf55543c3bd3814bf3867664 /drivers/devfreq/devfreq.c | |
| parent | Linux 3.12-rc7 (diff) | |
| parent | PM / devfreq: create_freezable_workqueue() doesn't return an ERR_PTR (diff) | |
| download | linux-dev-689e437076283837172248365cec54c5717f7b5d.tar.xz linux-dev-689e437076283837172248365cec54c5717f7b5d.zip | |
Merge branch 'for-rafael' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq
Pull devfreq fixes from MyungJoo Ham.
* 'for-rafael' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx/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 c99c00d35d34..22e5d2ffebd8 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; |