From patchwork Mon May 20 14:51:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 2593701 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5F63BDFF69 for ; Mon, 20 May 2013 15:02:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932115Ab3ETPCI (ORCPT ); Mon, 20 May 2013 11:02:08 -0400 Received: from smtp-out-214.synserver.de ([212.40.185.214]:1109 "EHLO smtp-out-209.synserver.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932101Ab3ETPCD (ORCPT ); Mon, 20 May 2013 11:02:03 -0400 Received: (qmail 6590 invoked by uid 0); 20 May 2013 14:51:54 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 6266 Received: from ppp-188-174-66-218.dynamic.mnet-online.de (HELO lars-adi-laptop.fritz.box) [188.174.66.218] by 217.119.54.77 with SMTP; 20 May 2013 14:51:53 -0000 From: Lars-Peter Clausen To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Lars-Peter Clausen , Wan ZongShun Subject: [PATCH 4/7] input: w90p910_keypad: Pass correct pointer to free_irq() Date: Mon, 20 May 2013 16:51:23 +0200 Message-Id: <1369061486-28226-4-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1369061486-28226-1-git-send-email-lars@metafoo.de> References: <1369061486-28226-1-git-send-email-lars@metafoo.de> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org free_irq() expects the same pointer that was passed to request_irq(), otherwise the IRQ is not freed. The issue was found using the following coccinelle script: @r1@ type T; T devid; @@ request_irq(..., devid) @r2@ type r1.T; T devid; position p; @@ free_irq@p(..., devid) @@ position p != r2.p; @@ *free_irq@p(...) Cc: Wan ZongShun Signed-off-by: Lars-Peter Clausen --- drivers/input/keyboard/w90p910_keypad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c index 72e6a56..7b03916 100644 --- a/drivers/input/keyboard/w90p910_keypad.c +++ b/drivers/input/keyboard/w90p910_keypad.c @@ -221,7 +221,7 @@ static int w90p910_keypad_probe(struct platform_device *pdev) return 0; failed_free_irq: - free_irq(irq, pdev); + free_irq(irq, keypad); failed_put_clk: clk_put(keypad->clk); failed_free_io: @@ -239,7 +239,7 @@ static int w90p910_keypad_remove(struct platform_device *pdev) struct w90p910_keypad *keypad = platform_get_drvdata(pdev); struct resource *res; - free_irq(keypad->irq, pdev); + free_irq(keypad->irq, keypad); clk_put(keypad->clk);