diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-23 17:58:09 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-23 17:58:09 +0300 |
| commit | 4bbba111d94781d34081c37856bbc5eb33f6c72a (patch) | |
| tree | b4d5358f92e6a0f695f34bef41f3df9158398f21 /sound/sound_firmware.c | |
| parent | 2130781e2aaab66e5a9f2fdc8af35da0153f405c (diff) | |
| parent | ce24f58a1187ca3058d72c3f897e3b574209ab20 (diff) | |
| download | linux-4bbba111d94781d34081c37856bbc5eb33f6c72a.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: HDA: Realtek: Avoid unnecessary volume control index on Surround/Side
ASoC: Support !REGULATOR build for sgtl5000
ALSA: hda - VIA: Fix VT1708 can't build up Headphone control issue
ALSA: hda - VIA: Correct stream names for VT1818S
ALSA: hda - VIA: Fix codec type for VT1708BCE at the right timing
ALSA: hda - VIA: Fix invalid A-A path volume adjust issue
ALSA: hda - VIA: Add missing support for VT1718S in A-A path
ALSA: hda - VIA: Fix independent headphone no sound issue
ALSA: hda - VIA: Fix stereo mixer recording no sound issue
ALSA: hda - Set EAPD for Realtek ALC665
ALSA: usb - Remove trailing spaces from USB card name strings
sound: read i_size with i_size_read()
ASoC: Remove bogus check for register validity in debugfs write
ASoC: mini2440: Fix uda134x codec problem.
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) 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); |