diff options
Diffstat (limited to 'drivers/media/common/saa7146_core.c')
-rw-r--r-- | drivers/media/common/saa7146_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c index 04c1938b9c9..ee16c042ef6 100644 --- a/drivers/media/common/saa7146_core.c +++ b/drivers/media/common/saa7146_core.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <media/saa7146.h> | 21 | #include <media/saa7146.h> |
22 | 22 | ||
23 | LIST_HEAD(saa7146_devices); | 23 | LIST_HEAD(saa7146_devices); |
24 | DECLARE_MUTEX(saa7146_devices_lock); | 24 | DEFINE_MUTEX(saa7146_devices_lock); |
25 | 25 | ||
26 | static int saa7146_num; | 26 | static int saa7146_num; |
27 | 27 | ||
@@ -402,11 +402,11 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent | |||
402 | 402 | ||
403 | pci_set_drvdata(pci, dev); | 403 | pci_set_drvdata(pci, dev); |
404 | 404 | ||
405 | init_MUTEX(&dev->lock); | 405 | mutex_init(&dev->lock); |
406 | spin_lock_init(&dev->int_slock); | 406 | spin_lock_init(&dev->int_slock); |
407 | spin_lock_init(&dev->slock); | 407 | spin_lock_init(&dev->slock); |
408 | 408 | ||
409 | init_MUTEX(&dev->i2c_lock); | 409 | mutex_init(&dev->i2c_lock); |
410 | 410 | ||
411 | dev->module = THIS_MODULE; | 411 | dev->module = THIS_MODULE; |
412 | init_waitqueue_head(&dev->i2c_wq); | 412 | init_waitqueue_head(&dev->i2c_wq); |