From 0acc11d9b5c216b866342877ae9b0e555b304c7e Mon Sep 17 00:00:00 2001 From: Andy Walls Date: Sun, 1 Feb 2009 23:44:00 -0300 Subject: [PATCH] --- yaml --- r: 137825 b: refs/heads/master c: 4325dff220918c2ced82d16c3475d9a5afb1cab3 h: refs/heads/master i: 137823: 15742b256b0699c6904f6a6c60fd71d12d4a3a3c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx18/cx18-driver.c | 2 -- trunk/drivers/media/video/cx18/cx18-driver.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b812ceb3f5c5..4896981de1f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b089742c79b39d4a650614896fec7a6569f338e +refs/heads/master: 4325dff220918c2ced82d16c3475d9a5afb1cab3 diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c index 1518a58e17fc..062f1910e8dd 100644 --- a/trunk/drivers/media/video/cx18/cx18-driver.c +++ b/trunk/drivers/media/video/cx18/cx18-driver.c @@ -563,8 +563,6 @@ static int __devinit cx18_init_struct1(struct cx18 *cx) mutex_init(&cx->epu2apu_mb_lock); mutex_init(&cx->epu2cpu_mb_lock); - spin_lock_init(&cx->lock); - cx->work_queue = create_singlethread_workqueue(cx->name); if (cx->work_queue == NULL) { CX18_ERR("Unable to create work hander thread\n"); diff --git a/trunk/drivers/media/video/cx18/cx18-driver.h b/trunk/drivers/media/video/cx18/cx18-driver.h index 3a21013cd82b..d95c6ace2b96 100644 --- a/trunk/drivers/media/video/cx18/cx18-driver.h +++ b/trunk/drivers/media/video/cx18/cx18-driver.h @@ -429,7 +429,6 @@ struct cx18 { unsigned long i_flags; /* global cx18 flags */ atomic_t ana_capturing; /* count number of active analog capture streams */ atomic_t tot_capturing; /* total count number of active capture streams */ - spinlock_t lock; /* lock access to this struct */ int search_pack_header; int open_id; /* incremented each time an open occurs, used as