diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 3339a101a..4ade7be29 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.32 2004/12/10 12:33:39 kraxel Exp $ + $Id: bttv-driver.c,v 1.33 2004/12/17 14:18:49 kraxel Exp $ bttv - Bt848 frame grabber driver @@ -3735,8 +3735,8 @@ static int __devinit bttv_probe(struct pci_dev *dev, /* initialize structs / fill in defaults */ init_MUTEX(&btv->lock); init_MUTEX(&btv->reslock); - btv->s_lock = SPIN_LOCK_UNLOCKED; - btv->gpio_lock = SPIN_LOCK_UNLOCKED; + spin_lock_init(&btv->s_lock); + spin_lock_init(&btv->gpio_lock); init_waitqueue_head(&btv->gpioq); init_waitqueue_head(&btv->i2c_queue); INIT_LIST_HEAD(&btv->c.subs); diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index 863e1272f..fa0984ff5 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-mpeg.c,v 1.16 2004/12/10 12:33:39 kraxel Exp $ + * $Id: cx88-mpeg.c,v 1.17 2004/12/17 14:18:49 kraxel Exp $ * * Support for the mpeg transport stream transfers * PCI function #2 of the cx2388x. @@ -343,7 +343,7 @@ int cx8802_init_common(struct cx8802_dev *dev) /* initialize driver struct */ init_MUTEX(&dev->lock); - dev->slock = SPIN_LOCK_UNLOCKED; + spin_lock_init(&dev->slock); /* init dma queue */ INIT_LIST_HEAD(&dev->mpegq.active); diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 1c9ced363..bf338d56e 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.50 2004/12/10 12:33:39 kraxel Exp $ + * $Id: cx88-video.c,v 1.51 2004/12/17 14:18:49 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -2035,7 +2035,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, /* initialize driver struct */ init_MUTEX(&dev->lock); - dev->slock = SPIN_LOCK_UNLOCKED; + spin_lock_init(&dev->slock); core->tvnorm = tvnorms; /* init video dma queues */ diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index a24d3f379..0acbfb094 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.22 2004/12/10 12:33:39 kraxel Exp $ + * $Id: saa7134-core.c,v 1.23 2004/12/17 14:18:49 kraxel Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -692,7 +692,7 @@ static int saa7134_hwinit1(struct saa7134_dev *dev) saa_writel(SAA7134_IRQ1, 0); saa_writel(SAA7134_IRQ2, 0); init_MUTEX(&dev->lock); - dev->slock = SPIN_LOCK_UNLOCKED; + spin_lock_init(&dev->slock); saa7134_track_gpio(dev,"pre-init"); saa7134_video_init1(dev); |