diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2005-12-18 18:52:14 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2005-12-18 18:52:14 +0000 |
| commit | c7d2857d16be5edb8e5e2e718012cd350b9a7d7b (patch) | |
| tree | a8766bc0e31bbc00aafb514e6eebc2bfdf355837 /linux | |
| parent | b46e4da924a68a3a4bdfa664c38b1b1d9a2dc064 (diff) | |
| download | mediapointer-dvb-s2-c7d2857d16be5edb8e5e2e718012cd350b9a7d7b.tar.gz mediapointer-dvb-s2-c7d2857d16be5edb8e5e2e718012cd350b9a7d7b.tar.bz2 | |
Replace del_timer with del_timer_sync
From: Andrew Morton <akpm@osdl.org>
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/bttv-input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bttv-input.c b/linux/drivers/media/video/bttv-input.c index 71d5b0cd1..21f8ebc44 100644 --- a/linux/drivers/media/video/bttv-input.c +++ b/linux/drivers/media/video/bttv-input.c @@ -1,5 +1,5 @@ /* - * $Id: bttv-input.c,v 1.2 2005/12/11 17:55:45 mchehab Exp $ + * $Id: bttv-input.c,v 1.3 2005/12/18 18:52:14 rmcc Exp $ * * Copyright (c) 2003 Gerd Knorr * Copyright (c) 2003 Pavel Machek @@ -676,7 +676,7 @@ void bttv_input_fini(struct bttv *btv) if (btv->remote->rc5_gpio) { u32 gpio; - del_timer(&btv->remote->timer_end); + del_timer_sync(&btv->remote->timer_end); flush_scheduled_work(); gpio = bttv_gpio_read(&btv->c); |