diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-input.c | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
2 files changed, 11 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); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index d39f4743a..85cdb0684 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-12-18 18:48 rmcc + + * linux/drivers/media/video/bttv-input.c: (bttv_input_fini): + + - Replace del_timer with del_timer_sync + + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2005-12-18 18:41 rmcc * linux/drivers/media/video/bttv-driver.c: |