aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-01-09 12:25:28 -0500
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-09 12:25:28 -0500
commitbc61b0102a53ee0ced3a8747cd4afe656a453756 (patch)
treeed977f30adf850ef88b198447796bac39fdfbc0c /drivers/media
parent889aee805a0c286e33965cc678ea16672d6c5666 (diff)
V4L/DVB (3193): Replace del_timer with del_timer_sync
- Replace del_timer with del_timer_sync Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/bttv-input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/bttv-input.c b/drivers/media/video/bttv-input.c
index fa6ccbc6f26d..12197f1b2757 100644
--- a/drivers/media/video/bttv-input.c
+++ b/drivers/media/video/bttv-input.c
@@ -668,7 +668,7 @@ void bttv_input_fini(struct bttv *btv)
668 if (btv->remote->rc5_gpio) { 668 if (btv->remote->rc5_gpio) {
669 u32 gpio; 669 u32 gpio;
670 670
671 del_timer(&btv->remote->timer_end); 671 del_timer_sync(&btv->remote->timer_end);
672 flush_scheduled_work(); 672 flush_scheduled_work();
673 673
674 gpio = bttv_gpio_read(&btv->c); 674 gpio = bttv_gpio_read(&btv->c);