From patchwork Mon Sep 6 21:26:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 4261 Return-path: Envelope-to: mchehab@gaivota Delivery-date: Mon, 06 Sep 2010 19:28:40 -0300 Received: from mchehab by gaivota with local (Exim 4.72) (envelope-from ) id 1OskB6-0000sn-H6 for mchehab@gaivota; Mon, 06 Sep 2010 19:28:40 -0300 Received: from bombadil.infradead.org [18.85.46.34] by gaivota with IMAP (fetchmail-6.3.17) for (single-drop); Mon, 06 Sep 2010 19:28:40 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OsjCv-0005lm-Fr; Mon, 06 Sep 2010 21:26:29 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755659Ab0IFV01 (ORCPT + 1 other); Mon, 6 Sep 2010 17:26:27 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:57693 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755476Ab0IFV0Z (ORCPT ); Mon, 6 Sep 2010 17:26:25 -0400 Received: by mail-fx0-f46.google.com with SMTP id 13so2662937fxm.19 for ; Mon, 06 Sep 2010 14:26:24 -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=sMZNaO48yl+jtjjS1lkpBDZoaO0cQh11g655dafUK7k0gjTLfjVbzXMqHKk6Vjf9y9 1MT0PsOF0hkWRvwtkrrZB6QOQdJ9FOi+JNRrJzyxFmCsvJ6cq7p13FUK6/wih9aZobpR nfKeaTHUDhGHkH6KamCY6drnIzdXAylAhVJ08= 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=yHlVV87+m3YZxx6mGv/9kAOt012CUz9wCs+Vrgm1eqXvPIuCK31sZkx9tXwkG79Tnm IX/txdfAnZhneeNa7P8GEqipWK14lrkqV6ro88/7QY2BxJhHaBlVeKCGtMze7lgX1Hef RKey835LAJfhO4DE7N4UysNHO6A+HMhpJIpqI= Received: by 10.223.123.199 with SMTP id q7mr2926819far.84.1283808384766; Mon, 06 Sep 2010 14:26:24 -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 k15sm2504881fai.16.2010.09.06.14.26.22 (version=SSLv3 cipher=RC4-MD5); Mon, 06 Sep 2010 14:26:23 -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, linux-media@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: Tue, 7 Sep 2010 00:26:07 +0300 Message-Id: <1283808373-27876-3-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1283808373-27876-1-git-send-email-maximlevitsky@gmail.com> References: <1283808373-27876-1-git-send-email-maximlevitsky@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: Mauro Carvalho Chehab As soon as input device is registered, it might be accessed (and it is) This can trigger a hardware interrupt that can access not yet initialized ir->raw, (by sending a sample) This can be reproduced by holding down a remote button and reloading the module. And this always crashes the systems where hardware decides to send an interrupt right at the moment it is enabled. Signed-off-by: Maxim Levitsky Acked-by: Jarod Wilson Acked-by: Jarod Wilson --- drivers/media/IR/ir-core-priv.h | 1 + drivers/media/IR/ir-keytable.c | 2 ++ drivers/media/IR/ir-sysfs.c | 27 +++++++++++++++++---------- 3 files changed, 20 insertions(+), 10 deletions(-) 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