From patchwork Mon May 20 14:51:24 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: 2593721 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 AEC24DF2A2 for ; Mon, 20 May 2013 15:02:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932099Ab3ETPCL (ORCPT ); Mon, 20 May 2013 11:02:11 -0400 Received: from smtp-out-214.synserver.de ([212.40.185.214]:1105 "EHLO smtp-out-209.synserver.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932109Ab3ETPCI (ORCPT ); Mon, 20 May 2013 11:02:08 -0400 Received: (qmail 6674 invoked by uid 0); 20 May 2013 14:51:55 -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:54 -0000 From: Lars-Peter Clausen To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Lars-Peter Clausen , Alessandro Zummo Subject: [PATCH 5/7] input: ixp4xx-beeper: Pass correct pointer to free_irq() Date: Mon, 20 May 2013 16:51:24 +0200 Message-Id: <1369061486-28226-5-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: Alessandro Zummo Signed-off-by: Lars-Peter Clausen --- drivers/input/misc/ixp4xx-beeper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c index 6ab3dec..deab4a11 100644 --- a/drivers/input/misc/ixp4xx-beeper.c +++ b/drivers/input/misc/ixp4xx-beeper.c @@ -125,7 +125,7 @@ static int ixp4xx_spkr_probe(struct platform_device *dev) return 0; err_free_irq: - free_irq(IRQ_IXP4XX_TIMER2, dev); + free_irq(IRQ_IXP4XX_TIMER2, (void *)dev->id); err_free_device: input_free_device(input_dev); @@ -144,7 +144,7 @@ static int ixp4xx_spkr_remove(struct platform_device *dev) disable_irq(IRQ_IXP4XX_TIMER2); ixp4xx_spkr_control(pin, 0); - free_irq(IRQ_IXP4XX_TIMER2, dev); + free_irq(IRQ_IXP4XX_TIMER2, (void *)dev->id); return 0; }