Merge tag 'ceph-for-5.10-rc1' of git://github.com/ceph/ceph-client

[linux-2.6-microblaze.git] / drivers / virt / vboxguest / vboxguest_linux.c

diff --git a/drivers/virt/vboxguest/vboxguest_linux.c b/drivers/virt/vboxguest/vboxguest_linux.c
index 32c2c52..73eb348 100644 (file)
--- a/drivers/virt/vboxguest/vboxguest_linux.c
+++ b/drivers/virt/vboxguest/vboxguest_linux.c
@@ -35,7 +35,7 @@ static u32 vbg_misc_device_requestor(struct inode *inode)
                        VMMDEV_REQUESTOR_CON_DONT_KNOW |
                        VMMDEV_REQUESTOR_TRUST_NOT_GIVEN;
 
-       if (from_kuid(current_user_ns(), current->cred->uid) == 0)
+       if (from_kuid(current_user_ns(), current_uid()) == 0)
                requestor |= VMMDEV_REQUESTOR_USR_ROOT;
        else
                requestor |= VMMDEV_REQUESTOR_USR_USER;
@@ -202,13 +202,8 @@ static int vbg_input_open(struct input_dev *input)
 {
        struct vbg_dev *gdev = input_get_drvdata(input);
        u32 feat = VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE | VMMDEV_MOUSE_NEW_PROTOCOL;
-       int ret;
 
-       ret = vbg_core_set_mouse_status(gdev, feat);
-       if (ret)
-               return ret;
-
-       return 0;
+       return vbg_core_set_mouse_status(gdev, feat);
 }
 
 /**