diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-04-07 15:19:36 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:57:01 -0400 |
commit | 6eb9435b874ae5ff56d56952167a8e9be5c5deeb (patch) | |
tree | a31bd6732a7396d7350baf5e5019b4037737609b /drivers/media/IR/ir-raw-event.c | |
parent | c373cabfbbb7631526003f17d470c0d1e5915a4c (diff) |
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.c | 4 |
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 @@ | |||
21 | 21 | ||
22 | /* Used to handle IR raw handler extensions */ | 22 | /* Used to handle IR raw handler extensions */ |
23 | static LIST_HEAD(ir_raw_handler_list); | 23 | static LIST_HEAD(ir_raw_handler_list); |
24 | static spinlock_t ir_raw_handler_lock; | 24 | static DEFINE_SPINLOCK(ir_raw_handler_lock); |
25 | 25 | ||
26 | /** | 26 | /** |
27 | * RUN_DECODER() - runs an operation on all IR decoders | 27 | * RUN_DECODER() - runs an operation on all IR decoders |
@@ -205,8 +205,6 @@ static void init_decoders(struct work_struct *work) | |||
205 | 205 | ||
206 | void ir_raw_init(void) | 206 | void ir_raw_init(void) |
207 | { | 207 | { |
208 | spin_lock_init(&ir_raw_handler_lock); | ||
209 | |||
210 | #ifdef MODULE | 208 | #ifdef MODULE |
211 | INIT_WORK(&wq_load, init_decoders); | 209 | INIT_WORK(&wq_load, init_decoders); |
212 | schedule_work(&wq_load); | 210 | schedule_work(&wq_load); |