diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
| commit | db5935001a43528e673ad26ffec9d98c60a496a9 (patch) | |
| tree | 8e735327a97beccabb5d94ef93df25d2bacda705 /sound/core/timer.c | |
| parent | 34f3a814eef8069a24e5b3ebcf27aba9dabac2ea (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into sched/core
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 e582face89d2..c584408c9f17 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); |