From patchwork Wed Apr 13 12:37:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: axel lin X-Patchwork-Id: 703711 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 p3DCbKV5009629 for ; Wed, 13 Apr 2011 12:37:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751608Ab1DMMhT (ORCPT ); Wed, 13 Apr 2011 08:37:19 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:64036 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126Ab1DMMhS (ORCPT ); Wed, 13 Apr 2011 08:37:18 -0400 Received: by iyb14 with SMTP id 14so545600iyb.19 for ; Wed, 13 Apr 2011 05:37:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:subject:from:to:cc:content-type:date:message-id :mime-version:x-mailer:content-transfer-encoding; bh=MsRs8JQoOPdifZWpaEkOkZtfBJssWpCIqY6CbUqRyFs=; b=vHouvR6jl61SEKu8ZAqwX3UB6khkdomNuUqh98zMiQ8MX4QMLJ7fhbUHsy2OYa/wxb wX3l/fHMZQdhPJlkEC/POa/ihLM5ZDCR+OootVzsDlregpbCxr+0bVwjdjQyVS5QGSvu cAtGnajzHuQYKIStjNInKaK3r4Bw5zsh0TRQA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=Q9lKV7LBi67uyNTufnGEqJjaZVDPdHI0a1NXwsn/7Uf9l2fjxFBTj9ZOlzy2Vq5EzH rjnJQNJWR+yYZE9GSmIFRkkpAKkZGeMBJgpqiBVGjtiXpLQu99yeOc+/DzhlfGHUaLDG HMVgrn/ouV9tssphT9GtOTyB4tJ7CZGu3J85s= Received: by 10.43.69.202 with SMTP id yd10mr6834932icb.375.1302698238208; Wed, 13 Apr 2011 05:37:18 -0700 (PDT) Received: from [59.117.64.92] (59-117-64-92.dynamic.hinet.net [59.117.64.92]) by mx.google.com with ESMTPS id g16sm421609ibb.3.2011.04.13.05.37.15 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 13 Apr 2011 05:37:17 -0700 (PDT) Subject: [PATCH] Input: h3600_ts_input - bugfix for request_irq()/free_irq() parameters From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Dmitry Torokhov , linux-input@vger.kernel.org Date: Wed, 13 Apr 2011 20:37:11 +0800 Message-ID: <1302698231.3002.4.camel@phoenix> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 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.6 (demeter1.kernel.org [140.211.167.41]); Wed, 13 Apr 2011 12:37:20 +0000 (UTC) The dev field of h3600_dev is a pointer, thus use ts->dev instead of &ts->dev as the dev_id argument while calling request_irq()/free_irq(). Signed-off-by: Axel Lin --- drivers/input/touchscreen/h3600_ts_input.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c index 45f93d0..211811a 100644 --- a/drivers/input/touchscreen/h3600_ts_input.c +++ b/drivers/input/touchscreen/h3600_ts_input.c @@ -396,14 +396,14 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv) set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE); if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler, - IRQF_SHARED | IRQF_DISABLED, "h3600_action", &ts->dev)) { + IRQF_SHARED | IRQF_DISABLED, "h3600_action", ts->dev)) { printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n"); err = -EBUSY; goto fail1; } if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler, - IRQF_SHARED | IRQF_DISABLED, "h3600_suspend", &ts->dev)) { + IRQF_SHARED | IRQF_DISABLED, "h3600_suspend", ts->dev)) { printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n"); err = -EBUSY; goto fail2; @@ -439,8 +439,8 @@ static void h3600ts_disconnect(struct serio *serio) { struct h3600_dev *ts = serio_get_drvdata(serio); - free_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, &ts->dev); - free_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, &ts->dev); + free_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, ts->dev); + free_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, ts->dev); input_get_device(ts->dev); input_unregister_device(ts->dev); serio_close(serio);