diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-mpeg.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index b5ef885ac..e36a9dccf 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -471,8 +471,6 @@ int cx8802_init_common(struct cx8802_dev *dev) #endif spin_lock_init(&dev->slock); - init_MUTEX(&dev->drvlist_lock); - /* init dma queue */ INIT_LIST_HEAD(&dev->mpegq.active); INIT_LIST_HEAD(&dev->mpegq.queued); @@ -726,9 +724,9 @@ int cx8802_register_driver(struct cx8802_driver *drv) err = drv->probe(driver); if (err == 0) { - down(&h->drvlist_lock); + mutex_lock(&drv->core->lock); list_add_tail(&driver->devlist,&h->drvlist.devlist); - up(&h->drvlist_lock); + mutex_unlock(&drv->core->lock); } else { printk(KERN_ERR "%s() ->probe failed err = %d\n", __FUNCTION__, err); } @@ -769,9 +767,9 @@ int cx8802_unregister_driver(struct cx8802_driver *drv) err = d->remove(d); if (err == 0) { - down(&h->drvlist_lock); + mutex_lock(&drv->core->lock); list_del(list2); - up(&h->drvlist_lock); + mutex_unlock(&drv->core->lock); } else printk(KERN_ERR "%s() ->remove failed err = %d\n", __FUNCTION__, err); |