Received: by 10.213.65.68 with SMTP id h4csp1766250imn; Mon, 19 Mar 2018 12:40:00 -0700 (PDT) X-Google-Smtp-Source: AG47ELuFKqVYfOHYSqgim7fFafLNKwQ5Sl4vdirovdITVXO10/rXFcc2hQA2RreNdhX8WUv9Ekfr X-Received: by 2002:a17:902:7081:: with SMTP id z1-v6mr8138085plk.333.1521488400927; Mon, 19 Mar 2018 12:40:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521488400; cv=none; d=google.com; s=arc-20160816; b=DSSKavaNKN+7EWYYsAYvFIG/VWJu7hFoVJXMEhRYnVe/JgPD/6A6JeWjq4z7UaUNBe UGmXGpICbuGbIunwJWnQ/D7kzQeVCn6WMyI+AZtKVA3xIR6DWTXiLOzqnu0N2BFcLD0s QDV7Nl+vCjTH1DEQalpNGdzOsjG4DdobFzDbvG37rX6WLThZ2IfCajkR9njSqkLTCBhp zQieY+Eo9o6YR8rTzzEVvAb88zEvKKaqzxcdUkP4SFVdSQk+4kyoQE3zxM1ITm8Wljir 91KPIEy6Oz2Awtt3JxDV5IY9kyroLq1xA4SXDvh5oZUD7irUaqTk8dzWGvZXZagn649q +DvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=4mhWavUPIIIe+aTXDJtnHuZzKYbqZ3bDbTru3DpdkJA=; b=fYGlSGYJJEqkQw/U838d+XwxSS04aP319E9Ic47EPr//ZD/GIg1y8qbuwAYnnO4mLI SDTBQP6Tu9Vl5DLSEHaIkDZMyErJc+QZf06WwbLhn9/ZQFk+Hkk400IOHwtCeY0HI3K+ AkgdJYdEE22T/lLI7d4ueOYHE4upz/z4Bf8mtISxjChO7hDe+wQzXlLLX2YbxO2SIhZm L9QqKxpYv7bP1p7YjgCDHmmQeL3lqZFEjN1MUQVgqzkdLA+CRRJufVQZdFWzP3eQ9Ww3 varPyf8FsZiNnqElk3hPgdjhHhku4g7XHXY5mWolwCuRmzYwyF6oQXsnEAOuqGFzoBgs fwgg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c24-v6si546528plo.273.2018.03.19.12.39.46; Mon, 19 Mar 2018 12:40:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030825AbeCSTiT (ORCPT + 99 others); Mon, 19 Mar 2018 15:38:19 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:48372 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031195AbeCSSWD (ORCPT ); Mon, 19 Mar 2018 14:22:03 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id E57D71279; Mon, 19 Mar 2018 18:22:02 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrey Rusalin , Samuel Ortiz , Sasha Levin Subject: [PATCH 4.9 092/241] NFC: pn533: change order of free_irq and dev unregistration Date: Mon, 19 Mar 2018 19:05:57 +0100 Message-Id: <20180319180755.008323601@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andrey Rusalin [ Upstream commit 068a496c4525c638ffab56449d905b88ef97fe32 ] Change order of free_irq and dev unregistration. It fixes situation when device already unregistered and an interrupt happens and nobody can handle it. Signed-off-by: Andrey Rusalin Signed-off-by: Samuel Ortiz Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/nfc/pn533/i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/nfc/pn533/i2c.c +++ b/drivers/nfc/pn533/i2c.c @@ -242,10 +242,10 @@ static int pn533_i2c_remove(struct i2c_c dev_dbg(&client->dev, "%s\n", __func__); - pn533_unregister_device(phy->priv); - free_irq(client->irq, phy); + pn533_unregister_device(phy->priv); + return 0; }