diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/sound_firmware.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/sound_firmware.c')
| -rw-r--r-- | sound/sound_firmware.c | 2 |
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) | |||
| 19 | printk(KERN_INFO "Unable to load '%s'.\n", fn); | 19 | printk(KERN_INFO "Unable to load '%s'.\n", fn); |
| 20 | return 0; | 20 | return 0; |
| 21 | } | 21 | } |
| 22 | l = filp->f_path.dentry->d_inode->i_size; | 22 | l = i_size_read(filp->f_path.dentry->d_inode); |
| 23 | if (l <= 0 || l > 131072) | 23 | if (l <= 0 || l > 131072) |
| 24 | { | 24 | { |
| 25 | printk(KERN_INFO "Invalid firmware '%s'\n", fn); | 25 | printk(KERN_INFO "Invalid firmware '%s'\n", fn); |