2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index e58b16442971..7bd36c80be5f 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1988,8 +1988,8 @@ gadgetfs_make_inode (struct super_block *sb,
         if (inode) {
                 inode->i_ino = get_next_ino();
                 inode->i_mode = mode;
-                inode->i_uid = default_uid;
-                inode->i_gid = default_gid;
+                inode->i_uid = make_kuid(&init_user_ns, default_uid);
+                inode->i_gid = make_kgid(&init_user_ns, default_gid);
                 inode->i_atime = inode->i_mtime = inode->i_ctime
                                 = CURRENT_TIME;
                 inode->i_private = data;
diff --git a/init/Kconfig b/init/Kconfig
index 60bdff259b27..633bde28c8ce 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -932,7 +932,6 @@ config UIDGID_CONVERTED
         depends on NET_9P = n
 
         # Filesystems
-        depends on USB_GADGETFS = n
         depends on USB_FUNCTIONFS = n
         depends on DEVTMPFS = n
         depends on XENFS = n