diff options
| author | Andy Walls <awalls@radix.net> | 2008-11-05 23:15:41 -0500 |
|---|---|---|
| committer | Andy Walls <awalls@radix.net> | 2008-11-05 23:15:41 -0500 |
| commit | f632c32a0a44337780146df40146d6330b6aa9d8 (patch) | |
| tree | 25a78d3cbb96507304ee77becd26cecbea0ec3df /linux/drivers/media/video/cx18/cx18-driver.c | |
| parent | 5c9a58b88f61db125e53c96ba49bada98fe466f0 (diff) | |
| download | mediapointer-dvb-s2-f632c32a0a44337780146df40146d6330b6aa9d8.tar.gz mediapointer-dvb-s2-f632c32a0a44337780146df40146d6330b6aa9d8.tar.bz2 | |
cx18: Add outgoing mailbox mutexes and check for ack via waitq vs poll
From: Andy Walls <awalls@radix.net>
Add mutexes to ensure exclusive access for outgoing driver to CX23418 mailboxes.
Also wait on a waitq for mailbox acknowledgement from the CX23418 instead of
polling.
Priority: high
Signed-off-by: Andy Walls <awalls@radix.net>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c index 62d88d284..470946fff 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.c +++ b/linux/drivers/media/video/cx18/cx18-driver.c @@ -446,6 +446,8 @@ static int __devinit cx18_init_struct1(struct cx18 *cx) mutex_init(&cx->i2c_bus_lock[0]); mutex_init(&cx->i2c_bus_lock[1]); mutex_init(&cx->gpio_lock); + mutex_init(&cx->epu2apu_mb_lock); + mutex_init(&cx->epu2cpu_mb_lock); spin_lock_init(&cx->lock); @@ -470,8 +472,6 @@ static int __devinit cx18_init_struct1(struct cx18 *cx) init_waitqueue_head(&cx->cap_w); init_waitqueue_head(&cx->mb_apu_waitq); init_waitqueue_head(&cx->mb_cpu_waitq); - init_waitqueue_head(&cx->mb_epu_waitq); - init_waitqueue_head(&cx->mb_hpu_waitq); init_waitqueue_head(&cx->dma_waitq); /* VBI */ |