From patchwork Thu Apr 15 21:46:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?RGF2aWQgSMODwqRyZGVtYW4=?= X-Patchwork-Id: 92962 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3FLk7e2021254 for ; Thu, 15 Apr 2010 21:47:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757800Ab0DOVqa (ORCPT ); Thu, 15 Apr 2010 17:46:30 -0400 Received: from 1-1-12-13a.han.sth.bostream.se ([82.182.30.168]:52174 "EHLO palpatine.hardeman.nu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757799Ab0DOVq3 (ORCPT ); Thu, 15 Apr 2010 17:46:29 -0400 Received: from basil.haag.hardeman.nu (host-88-217-225-61.customer.m-online.net [88.217.225.61]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "basil.haag.hardeman.nu", Issuer "hardeman.nu CA" (verified OK)) by palpatine.hardeman.nu (Postfix) with ESMTPSA id CD75214E7; Thu, 15 Apr 2010 23:46:27 +0200 (CEST) Received: by basil.haag.hardeman.nu (Postfix, from userid 1000) id BF00C1A01B3; Thu, 15 Apr 2010 23:46:25 +0200 (CEST) Subject: [PATCH 6/8] ir-core: fix double spinlock init in drivers/media/IR/rc-map.c To: mchehab@redhat.com From: David =?utf-8?b?SMOkcmRlbWFu?= Cc: linux-media@vger.kernel.org, linux-input@vger.kernel.org Date: Thu, 15 Apr 2010 23:46:25 +0200 Message-ID: <20100415214625.14142.66208.stgit@localhost.localdomain> In-Reply-To: <20100415214520.14142.56114.stgit@localhost.localdomain> References: <20100415214520.14142.56114.stgit@localhost.localdomain> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 15 Apr 2010 21:47:52 +0000 (UTC) diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c index dfd45fa..876baae 100644 --- a/drivers/media/IR/ir-sysfs.c +++ b/drivers/media/IR/ir-sysfs.c @@ -294,8 +294,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); - -}