diff options
| author | Michael Hunold <devnull@localhost> | 2005-01-21 14:45:06 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2005-01-21 14:45:06 +0000 |
| commit | b166ed22268f79cb34ef95ce95631331381717ff (patch) | |
| tree | c735880d90aa3bcfa36374817820416b38d8873a /linux/drivers/media/common/saa7146_core.c | |
| parent | 6d40e62c1ad6249ce66d56629d0c76bcd064e3fd (diff) | |
| download | mediapointer-dvb-s2-b166ed22268f79cb34ef95ce95631331381717ff.tar.gz mediapointer-dvb-s2-b166ed22268f79cb34ef95ce95631331381717ff.tar.bz2 | |
various backport from 2.6.11-rc1:
- replace static spinlock initializations with spin_lock_init()
- add le16_to_cpu() macros to various values aquired via USB
- add __user annotations to user space pointers
Diffstat (limited to 'linux/drivers/media/common/saa7146_core.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index b65092a84..9acb1bf40 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -426,8 +426,8 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent pci_set_drvdata(pci, dev); init_MUTEX(&dev->lock); - dev->int_slock = SPIN_LOCK_UNLOCKED; - dev->slock = SPIN_LOCK_UNLOCKED; + spin_lock_init(&dev->int_slock); + spin_lock_init(&dev->slock); init_MUTEX(&dev->i2c_lock); |