diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 11:58:57 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 11:58:57 +0200 |
| commit | 3374cd1abd478f767aaedf2c21d109596ff0fe72 (patch) | |
| tree | 46b00a571ba5d86373bd9054fdccc5dc6e28e42f /sound/core/timer.c | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
| parent | 670ff6abd6caff406b217f8a828d6c03656535d8 (diff) | |
| download | op-kernel-dev-3374cd1abd478f767aaedf2c21d109596ff0fe72.zip op-kernel-dev-3374cd1abd478f767aaedf2c21d109596ff0fe72.tar.gz | |
Merge branch 'topic/core-cleanup' into for-linus
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 5040c7b..13afb60 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1238,6 +1238,11 @@ static void snd_timer_user_tinterrupt(struct snd_timer_instance *timeri, static int snd_timer_user_open(struct inode *inode, struct file *file) { struct snd_timer_user *tu; + int err; + + err = nonseekable_open(inode, file); + if (err < 0) + return err; tu = kzalloc(sizeof(*tu), GFP_KERNEL); if (tu == NULL) @@ -1922,6 +1927,7 @@ static const struct file_operations snd_timer_f_ops = .read = snd_timer_user_read, .open = snd_timer_user_open, .release = snd_timer_user_release, + .llseek = no_llseek, .poll = snd_timer_user_poll, .unlocked_ioctl = snd_timer_user_ioctl, .compat_ioctl = snd_timer_user_ioctl_compat, |
