summaryrefslogtreecommitdiff
path: root/drivers/media/IR/ir-raw-event.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-04-07 23:19:36 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 19:57:01 +0400
commit6eb9435b874ae5ff56d56952167a8e9be5c5deeb (patch)
treea31bd6732a7396d7350baf5e5019b4037737609b /drivers/media/IR/ir-raw-event.c
parentc373cabfbbb7631526003f17d470c0d1e5915a4c (diff)
downloadlinux-6eb9435b874ae5ff56d56952167a8e9be5c5deeb.tar.xz
V4L/DVB: ir: Make sure that the spinlocks are properly initialized
Some spinlocks are not properly initialized on ir core: [ 471.714132] BUG: spinlock bad magic on CPU#0, modprobe/1899 [ 471.719838] lock: f92a08ac, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0 [ 471.727301] Pid: 1899, comm: modprobe Not tainted 2.6.33 #36 [ 471.733062] Call Trace: [ 471.735537] [<c1498793>] ? printk+0x1d/0x22 [ 471.739866] [<c12694e3>] spin_bug+0xa3/0xf0 [ 471.744224] [<c126962d>] do_raw_spin_lock+0x7d/0x160 [ 471.749364] [<f92a01ff>] ? ir_rc5_register+0x6f/0xf0 [ir_rc5_decoder] So, use static initialization for the static spinlocks, instead of the dynamic ones (currently used), as proposed by David Härdeman on one of his RFC patches. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/IR/ir-raw-event.c')
-rw-r--r--drivers/media/IR/ir-raw-event.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/IR/ir-raw-event.c
index 57990a337922..ddb3365adc82 100644
--- a/drivers/media/IR/ir-raw-event.c
+++ b/drivers/media/IR/ir-raw-event.c
@@ -21,7 +21,7 @@
/* Used to handle IR raw handler extensions */
static LIST_HEAD(ir_raw_handler_list);
-static spinlock_t ir_raw_handler_lock;
+static DEFINE_SPINLOCK(ir_raw_handler_lock);
/**
* RUN_DECODER() - runs an operation on all IR decoders
@@ -205,8 +205,6 @@ static void init_decoders(struct work_struct *work)
void ir_raw_init(void)
{
- spin_lock_init(&ir_raw_handler_lock);
-
#ifdef MODULE
INIT_WORK(&wq_load, init_decoders);
schedule_work(&wq_load);