diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
commit | d1a020050c6ce1a0794ff73582ccf47e4db536f7 (patch) | |
tree | 1b7250410f24703cd77c76156e758db9887137aa /fs/open.c | |
parent | ALSA: rename "Device" to "Toshiba SB-0500" via quirks (diff) | |
parent | ALSA: usb-audio - Cache mixer values (diff) | |
download | linux-d1a020050c6ce1a0794ff73582ccf47e4db536f7.tar.xz linux-d1a020050c6ce1a0794ff73582ccf47e4db536f7.zip |
Merge branch 'topic/usb-mixer-cache' into next/usb-audio
Diffstat (limited to 'fs/open.c')
-rw-r--r-- | fs/open.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/open.c b/fs/open.c index 1cd7d40e9991..d882fd2351d6 100644 --- a/fs/open.c +++ b/fs/open.c @@ -412,7 +412,7 @@ asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len) if (((offset + len) > inode->i_sb->s_maxbytes) || ((offset + len) < 0)) goto out_fput; - if (inode->i_op && inode->i_op->fallocate) + if (inode->i_op->fallocate) ret = inode->i_op->fallocate(inode, mode, offset, len); else ret = -EOPNOTSUPP; |