From patchwork Sun Sep 5 22:22:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 157031 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o85MMtwM008961 for ; Sun, 5 Sep 2010 22:22:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752880Ab0IEWWz (ORCPT ); Sun, 5 Sep 2010 18:22:55 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:34156 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753678Ab0IEWWx (ORCPT ); Sun, 5 Sep 2010 18:22:53 -0400 Received: by mail-fx0-f46.google.com with SMTP id 13so2219369fxm.19 for ; Sun, 05 Sep 2010 15:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=uQB288xidrQTt241OhROv9mpSJhy7S+y+MXp5ffOcso=; b=ZfVr+V1iQ9NT8bDPb+x+qr+a/fk61Hl7t1B2gqjMVqpG1cSvMb98/xu2MaqPn3NrB9 XgONuok1PB2BymcWg4L2dffu6krduaT7lzDEiUnhdLV1iwg0i2hGJv2oGkwQhVXpxwfP MJ+Bz/E1DP8uVoaQuBKbnaRDzcbSSnOB59yX0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=TNhrYpzlmsjVjjqDLYxBWEUc+weBmtm3sNvovWwfmqqbyeT6sbh8xTWMrAJLTK12Vw wtgZr3CCjFN9OzPz1jmZQcEzLNhE4Yz3+p1Y/MEtlueIzo/QHlhSJiQACunAjhaAxAo3 N0l5LzJBzUBqCtY68YuLQlJF4uEfdpJ5wvI2c= Received: by 10.223.111.206 with SMTP id t14mr1963112fap.32.1283725372358; Sun, 05 Sep 2010 15:22:52 -0700 (PDT) Received: from localhost.localdomain (IGLD-84-228-233-189.inter.net.il [84.228.233.189]) by mx.google.com with ESMTPS id u8sm2055880fah.36.2010.09.05.15.22.50 (version=SSLv3 cipher=RC4-MD5); Sun, 05 Sep 2010 15:22:51 -0700 (PDT) From: Maxim Levitsky To: lirc-list@lists.sourceforge.net Cc: Jarod Wilson , =?UTF-8?q?David=20H=C3=A4rdeman?= , mchehab@infradead.org, linux-input@vger.kernel.org, Maxim Levitsky Subject: [PATCH 2/8] IR: make sure we register the input device when it is safe to do so. Date: Mon, 6 Sep 2010 01:22:38 +0300 Message-Id: <1283725364-4053-3-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1283725364-4053-1-git-send-email-maximlevitsky@gmail.com> References: <1283725364-4053-1-git-send-email-maximlevitsky@gmail.com> 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 (demeter1.kernel.org [140.211.167.41]); Sun, 05 Sep 2010 22:22:56 +0000 (UTC) diff --git a/drivers/media/IR/ir-core-priv.h b/drivers/media/IR/ir-core-priv.h index 761e7f4..5d7e08f 100644 --- a/drivers/media/IR/ir-core-priv.h +++ b/drivers/media/IR/ir-core-priv.h @@ -116,6 +116,7 @@ static inline void decrease_duration(struct ir_raw_event *ev, unsigned duration) * Routines from ir-sysfs.c - Meant to be called only internally inside * ir-core */ +int ir_register_input(struct input_dev *input_dev); int ir_register_class(struct input_dev *input_dev); void ir_unregister_class(struct input_dev *input_dev); diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c index 51dbc67..0917535 100644 --- a/drivers/media/IR/ir-keytable.c +++ b/drivers/media/IR/ir-keytable.c @@ -505,6 +505,8 @@ int __ir_input_register(struct input_dev *input_dev, goto out_event; } + rc = ir_register_input(input_dev); + IR_dprintk(1, "Registered input device on %s for %s remote%s.\n", driver_name, rc_tab->name, (ir_dev->props && ir_dev->props->driver_type == RC_DRIVER_IR_RAW) ? diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c index 96dafc4..c0075f1 100644 --- a/drivers/media/IR/ir-sysfs.c +++ b/drivers/media/IR/ir-sysfs.c @@ -251,8 +251,6 @@ static struct device_type rc_dev_type = { */ int ir_register_class(struct input_dev *input_dev) { - int rc; - const char *path; struct ir_input_dev *ir_dev = input_get_drvdata(input_dev); int devno = find_first_zero_bit(&ir_core_dev_number, IRRCV_NUM_DEVICES); @@ -261,17 +259,28 @@ int ir_register_class(struct input_dev *input_dev) return devno; ir_dev->dev.type = &rc_dev_type; + ir_dev->devno = devno; ir_dev->dev.class = &ir_input_class; ir_dev->dev.parent = input_dev->dev.parent; + input_dev->dev.parent = &ir_dev->dev; dev_set_name(&ir_dev->dev, "rc%d", devno); dev_set_drvdata(&ir_dev->dev, ir_dev); - rc = device_register(&ir_dev->dev); - if (rc) - return rc; + return device_register(&ir_dev->dev); +}; + +/** + * ir_register_input - registers ir input device with input subsystem + * @input_dev: the struct input_dev descriptor of the device + */ + +int ir_register_input(struct input_dev *input_dev) +{ + struct ir_input_dev *ir_dev = input_get_drvdata(input_dev); + int rc; + const char *path; - input_dev->dev.parent = &ir_dev->dev; rc = input_register_device(input_dev); if (rc < 0) { device_del(&ir_dev->dev); @@ -287,11 +296,9 @@ int ir_register_class(struct input_dev *input_dev) path ? path : "N/A"); kfree(path); - ir_dev->devno = devno; - set_bit(devno, &ir_core_dev_number); - + set_bit(ir_dev->devno, &ir_core_dev_number); return 0; -}; +} /** * ir_unregister_class() - removes the sysfs for sysfs for