summaryrefslogtreecommitdiff
path: root/kernel/vhost_task.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.com>2025-03-26 13:50:46 +0100
committerJiri Kosina <jkosina@suse.com>2025-03-26 13:50:46 +0100
commit770493524e9f623826765eb97c64d699f4752e4f (patch)
tree304c718009aa32834511d45497adb8acba496088 /kernel/vhost_task.c
parente4f7cc8c36e7cab391683db682402ab2f185bf92 (diff)
parentfe0fb58325e519008e2606a5aa2cff7ad23e212d (diff)
Merge branch 'for-6.15/intel-ish' into for-linus
- intel-ish Kbuild cleanup (Jiri Kosina)
Diffstat (limited to 'kernel/vhost_task.c')
-rw-r--r--kernel/vhost_task.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/vhost_task.c b/kernel/vhost_task.c
index 8800f5acc0071..2ef2e1b800916 100644
--- a/kernel/vhost_task.c
+++ b/kernel/vhost_task.c
@@ -133,7 +133,7 @@ struct vhost_task *vhost_task_create(bool (*fn)(void *),
vtsk = kzalloc(sizeof(*vtsk), GFP_KERNEL);
if (!vtsk)
- return NULL;
+ return ERR_PTR(-ENOMEM);
init_completion(&vtsk->exited);
mutex_init(&vtsk->exit_mutex);
vtsk->data = arg;
@@ -145,7 +145,7 @@ struct vhost_task *vhost_task_create(bool (*fn)(void *),
tsk = copy_process(NULL, 0, NUMA_NO_NODE, &args);
if (IS_ERR(tsk)) {
kfree(vtsk);
- return NULL;
+ return ERR_PTR(PTR_ERR(tsk));
}
vtsk->task = tsk;