aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/tw686x/tw686x-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/pci/tw686x/tw686x-core.c')
-rw-r--r--drivers/media/pci/tw686x/tw686x-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/tw686x/tw686x-core.c b/drivers/media/pci/tw686x/tw686x-core.c
index 80bd268926cc..f39e0e34deb6 100644
--- a/drivers/media/pci/tw686x/tw686x-core.c
+++ b/drivers/media/pci/tw686x/tw686x-core.c
@@ -125,7 +125,7 @@ void tw686x_enable_channel(struct tw686x_dev *dev, unsigned int channel)
*/
static void tw686x_dma_delay(struct timer_list *t)
{
- struct tw686x_dev *dev = from_timer(dev, t, dma_delay_timer);
+ struct tw686x_dev *dev = timer_container_of(dev, t, dma_delay_timer);
unsigned long flags;
spin_lock_irqsave(&dev->lock, flags);