Merge branch 'for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[sfrench/cifs-2.6.git] / drivers / pnp / pnpbios / core.c

diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index e681140b85d8f8f2811d10311e901b95e73cb859..077f334fdbae96fef09306ee8f90059eaadcc455 100644 (file)
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -581,10 +581,7 @@ static int __init pnpbios_thread_init(void)
 
        init_completion(&unload_sem);
        task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
-       if (IS_ERR(task))
-               return PTR_ERR(task);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(task);
 }
 
 /* Start the kernel thread later: */