diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2019-04-11 17:15:35 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-04-11 17:15:35 +0200 |
| commit | 2b899390fdc8b8bdb95ce24269a799194b303388 (patch) | |
| tree | ee02a7ae5b0f94029c5594573ae4aa97944a2c0c /kernel/workqueue.c | |
| parent | iommu/vt-d: Switch to bitmap_zalloc() (diff) | |
| parent | iommu: Bind process address spaces to devices (diff) | |
Merge branch 'api-features' into x86/vt-d
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 4026d1871407..ddee541ea97a 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4266,7 +4266,7 @@ struct workqueue_struct *alloc_workqueue(const char *fmt, INIT_LIST_HEAD(&wq->list); if (alloc_and_link_pwqs(wq) < 0) - goto err_free_wq; + goto err_unreg_lockdep; if (wq_online && init_rescuer(wq) < 0) goto err_destroy; @@ -4292,9 +4292,10 @@ struct workqueue_struct *alloc_workqueue(const char *fmt, return wq; -err_free_wq: +err_unreg_lockdep: wq_unregister_lockdep(wq); wq_free_lockdep(wq); +err_free_wq: free_workqueue_attrs(wq->unbound_attrs); kfree(wq); return NULL; |