summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-03-21 11:05:48 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2011-03-21 11:05:48 +1100
commit2731120af99fbcc30605e4d52b8fca55fd31879c (patch)
tree2f7fbb125d7ae09904e4fa492cd4a6f638a44b8a /sound
parent3d1320848dad0a307fad9d2d932abbcbb69b8bff (diff)
parentf24a28cc101088466179902906a6bd801a715b66 (diff)
Merge remote-tracking branch 'sound/for-next'
Diffstat (limited to 'sound')
-rw-r--r--sound/sound_firmware.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/sound_firmware.c b/sound/sound_firmware.c
index 340a0bc5303e..7e96249536b4 100644
--- a/sound/sound_firmware.c
+++ b/sound/sound_firmware.c
@@ -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);