Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[cascardo/linux.git] / fs / dlm / user.c

diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 3596050..173b387 100644 (file)
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -362,18 +362,15 @@ fail:
 
 int dlm_device_deregister(struct dlm_ls *ls)
 {
-       int error;
-
        /* The device is not registered.  This happens when the lockspace
           was never used from userspace, or when device_create_lockspace()
           calls dlm_release_lockspace() after the register fails. */
        if (!ls->ls_device.name)
                return 0;
 
-       error = misc_deregister(&ls->ls_device);
-       if (!error)
-               kfree(ls->ls_device.name);
-       return error;
+       misc_deregister(&ls->ls_device);
+       kfree(ls->ls_device.name);
+       return 0;
 }
 
 static int device_user_purge(struct dlm_user_proc *proc,