diff options
| author | David Härdeman <david@hardeman.nu> | 2010-04-15 18:46:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 12:57:46 -0300 |
| commit | d46844300ccd99444d32e481751b6508c8c7834e (patch) | |
| tree | fb624aaedbf6e50b1a5570bd67d96b5c0f557929 | |
| parent | 15100d891a53ffc717cec21d805f8c49db51fb65 (diff) | |
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 <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/IR/ir-sysfs.c | 2 | ||||
| -rw-r--r-- | drivers/media/IR/rc-map.c | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c index 4c0bc32dcba..18cab0f59fd 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 1a3f4b123a3..caf6a27b08c 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); - -} |