Merge tag 'regmap-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

[platform/adaptation/renesas_rcar/renesas_kernel.git] / sound / sound_firmware.c

diff --git a/sound/sound_firmware.c b/sound/sound_firmware.c
index 340a0bc..37711a5 100644 (file)
--- a/sound/sound_firmware.c
+++ b/sound/sound_firmware.c
@@ -19,18 +19,18 @@ static int do_mod_firmware_load(const char *fn, char **fp)
                printk(KERN_INFO "Unable to load '%s'.\n", fn);
                return 0;
        }
-       l = filp->f_path.dentry->d_inode->i_size;
+       l = i_size_read(filp->f_path.dentry->d_inode);
        if (l <= 0 || l > 131072)
        {
                printk(KERN_INFO "Invalid firmware '%s'\n", fn);
-               filp_close(filp, current->files);
+               filp_close(filp, NULL);
                return 0;
        }
        dp = vmalloc(l);
        if (dp == NULL)
        {
                printk(KERN_INFO "Out of memory loading '%s'.\n", fn);
-               filp_close(filp, current->files);
+               filp_close(filp, NULL);
                return 0;
        }
        pos = 0;
@@ -38,10 +38,10 @@ static int do_mod_firmware_load(const char *fn, char **fp)
        {
                printk(KERN_INFO "Failed to read '%s'.\n", fn);
                vfree(dp);
-               filp_close(filp, current->files);
+               filp_close(filp, NULL);
                return 0;
        }
-       filp_close(filp, current->files);
+       filp_close(filp, NULL);
        *fp = dp;
        return (int) l;
 }