diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /sound/core/timer.c | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index e582face89d..c584408c9f1 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c | |||
| @@ -1263,7 +1263,6 @@ static int snd_timer_user_release(struct inode *inode, struct file *file) | |||
| 1263 | if (file->private_data) { | 1263 | if (file->private_data) { |
| 1264 | tu = file->private_data; | 1264 | tu = file->private_data; |
| 1265 | file->private_data = NULL; | 1265 | file->private_data = NULL; |
| 1266 | fasync_helper(-1, file, 0, &tu->fasync); | ||
| 1267 | if (tu->timeri) | 1266 | if (tu->timeri) |
| 1268 | snd_timer_close(tu->timeri); | 1267 | snd_timer_close(tu->timeri); |
| 1269 | kfree(tu->queue); | 1268 | kfree(tu->queue); |