From: David Härdeman Date: Thu, 15 Apr 2010 21:46:25 +0000 (-0300) Subject: V4L/DVB: ir-core: fix double spinlock init in drivers/media/IR/rc-map.c X-Git-Tag: v3.0~4938^2~152 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d46844300ccd99444d32e481751b6508c8c7834e;p=platform%2Fkernel%2Flinux-amlogic.git V4L/DVB: ir-core: fix double spinlock init in drivers/media/IR/rc-map.c Fix a double initialization of the same spinlock in drivers/media/IR/rc-map.c. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c index 4c0bc32..18cab0f 100644 --- a/drivers/media/IR/ir-sysfs.c +++ b/drivers/media/IR/ir-sysfs.c @@ -295,8 +295,6 @@ static int __init ir_core_init(void) /* Initialize/load the decoders/keymap code that will be used */ ir_raw_init(); - rc_map_init(); - return 0; } diff --git a/drivers/media/IR/rc-map.c b/drivers/media/IR/rc-map.c index 1a3f4b1..caf6a27 100644 --- a/drivers/media/IR/rc-map.c +++ b/drivers/media/IR/rc-map.c @@ -81,8 +81,3 @@ void ir_unregister_map(struct rc_keymap *map) } EXPORT_SYMBOL_GPL(ir_unregister_map); -void rc_map_init(void) -{ - spin_lock_init(&rc_map_lock); - -}