serial: PL011: clear pending interrupts

[linux-flexiantxendom0.git] / sound / sound_firmware.c

diff --git a/sound/sound_firmware.c b/sound/sound_firmware.c
index 3304344..7e96249 100644 (file)
--- a/sound/sound_firmware.c
+++ b/sound/sound_firmware.c
@@ -2,7 +2,7 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
+#include <linux/sched.h>
 #include <asm/uaccess.h>
 #include "oss/sound_firmware.h"
 
@@ -19,7 +19,7 @@ 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);