diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-05 14:14:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-05 14:14:46 +0100 |
| commit | 27066fd484a32c80630136aa2b91c980f3198f9d (patch) | |
| tree | 78ddabdedbfd7525d13ecd62a745525843f1d0e8 /net/ceph/messenger.c | |
| parent | 101e5f77bf35679809586e250b6c62193d2ed179 (diff) | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
| download | kernel_samsung_crespo-27066fd484a32c80630136aa2b91c980f3198f9d.zip kernel_samsung_crespo-27066fd484a32c80630136aa2b91c980f3198f9d.tar.gz kernel_samsung_crespo-27066fd484a32c80630136aa2b91c980f3198f9d.tar.bz2 | |
Merge commit 'v2.6.37' into sched/core
Merge reason: Merge the final .37 tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/ceph/messenger.c')
| -rw-r--r-- | net/ceph/messenger.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 1c7a2ec..b6ff4a1 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -97,11 +97,9 @@ struct workqueue_struct *ceph_msgr_wq; int ceph_msgr_init(void) { ceph_msgr_wq = create_workqueue("ceph-msgr"); - if (IS_ERR(ceph_msgr_wq)) { - int ret = PTR_ERR(ceph_msgr_wq); - pr_err("msgr_init failed to create workqueue: %d\n", ret); - ceph_msgr_wq = NULL; - return ret; + if (!ceph_msgr_wq) { + pr_err("msgr_init failed to create workqueue\n"); + return -ENOMEM; } return 0; } |