aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/cx18/cx18-driver.c2
-rw-r--r--drivers/media/video/cx18/cx18-driver.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 1518a58e17fc..062f1910e8dd 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -563,8 +563,6 @@ static int __devinit cx18_init_struct1(struct cx18 *cx)
563 mutex_init(&cx->epu2apu_mb_lock); 563 mutex_init(&cx->epu2apu_mb_lock);
564 mutex_init(&cx->epu2cpu_mb_lock); 564 mutex_init(&cx->epu2cpu_mb_lock);
565 565
566 spin_lock_init(&cx->lock);
567
568 cx->work_queue = create_singlethread_workqueue(cx->name); 566 cx->work_queue = create_singlethread_workqueue(cx->name);
569 if (cx->work_queue == NULL) { 567 if (cx->work_queue == NULL) {
570 CX18_ERR("Unable to create work hander thread\n"); 568 CX18_ERR("Unable to create work hander thread\n");
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 3a21013cd82b..d95c6ace2b96 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -429,7 +429,6 @@ struct cx18 {
429 unsigned long i_flags; /* global cx18 flags */ 429 unsigned long i_flags; /* global cx18 flags */
430 atomic_t ana_capturing; /* count number of active analog capture streams */ 430 atomic_t ana_capturing; /* count number of active analog capture streams */
431 atomic_t tot_capturing; /* total count number of active capture streams */ 431 atomic_t tot_capturing; /* total count number of active capture streams */
432 spinlock_t lock; /* lock access to this struct */
433 int search_pack_header; 432 int search_pack_header;
434 433
435 int open_id; /* incremented each time an open occurs, used as 434 int open_id; /* incremented each time an open occurs, used as