Merge tag 'module-builtin_driver-v4.1-rc8' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-block.git] / sound / sound_firmware.c

diff --git a/sound/sound_firmware.c b/sound/sound_firmware.c
index b155137ee312a5105517718d483b2db322958943..026347643c8177266359513c255b930b8bf8307e 100644 (file)
--- a/sound/sound_firmware.c
+++ b/sound/sound_firmware.c
@@ -12,7 +12,6 @@ static int do_mod_firmware_load(const char *fn, char **fp)
        struct file* filp;
        long l;
        char *dp;
-       loff_t pos;
 
        filp = filp_open(fn, 0, 0);
        if (IS_ERR(filp))
@@ -34,8 +33,7 @@ static int do_mod_firmware_load(const char *fn, char **fp)
                fput(filp);
                return 0;
        }
-       pos = 0;
-       if (vfs_read(filp, dp, l, &pos) != l)
+       if (kernel_read(filp, 0, dp, l) != l)
        {
                printk(KERN_INFO "Failed to read '%s'.\n", fn);
                vfree(dp);