2 files changed, 8 insertions, 10 deletions

diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index ae8b18869b8c..8d9bcd8207c8 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -656,9 +656,8 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
         if (!(filp->f_mode & FMODE_WRITE))
                 ro = 1;
 
-        if (filp->f_path.dentry)
-                inode = filp->f_path.dentry->d_inode;
-        if (!inode || (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))) {
+        inode = filp->f_path.dentry->d_inode;
+        if ((!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))) {
                 LINFO(curlun, "invalid file type: %s\n", filename);
                 goto out;
         }
@@ -667,7 +666,7 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
          * If we can't read the file, it's no good.
          * If we can't write the file, use it read-only.
          */
-        if (!filp->f_op || !(filp->f_op->read || filp->f_op->aio_read)) {
+        if (!(filp->f_op->read || filp->f_op->aio_read)) {
                 LINFO(curlun, "file not readable: %s\n", filename);
                 goto out;
         }
@@ -712,7 +711,6 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
         if (fsg_lun_is_open(curlun))
                 fsg_lun_close(curlun);
 
-        get_file(filp);
         curlun->blksize = blksize;
         curlun->blkbits = blkbits;
         curlun->ro = ro;
@@ -720,10 +718,10 @@ static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
         curlun->file_length = size;
         curlun->num_sectors = num_sectors;
         LDBG(curlun, "open backing file: %s\n", filename);
-        rc = 0;
+        return 0;
 
 out:
-        filp_close(filp, current->files);
+        fput(filp);
         return rc;
 }
 
diff --git a/drivers/usb/gadget/u_uac1.c b/drivers/usb/gadget/u_uac1.c
index af9898982059..e0c5e88e03ed 100644
--- a/drivers/usb/gadget/u_uac1.c
+++ b/drivers/usb/gadget/u_uac1.c
@@ -275,17 +275,17 @@ static int gaudio_close_snd_dev(struct gaudio *gau)
         /* Close control device */
         snd = &gau->control;
         if (snd->filp)
-                filp_close(snd->filp, current->files);
+                filp_close(snd->filp, NULL);
 
         /* Close PCM playback device and setup substream */
         snd = &gau->playback;
         if (snd->filp)
-                filp_close(snd->filp, current->files);
+                filp_close(snd->filp, NULL);
 
         /* Close PCM capture device and setup substream */
         snd = &gau->capture;
         if (snd->filp)
-                filp_close(snd->filp, current->files);
+                filp_close(snd->filp, NULL);
 
         return 0;
 }