From: Andrey Rusalin <arusalin@dev.rtsoft.ru>
Date: Wed, 28 Dec 2016 17:10:57 +0000 (+0300)
Subject: NFC: pn533: change order of free_irq and dev unregistration
X-Git-Tag: v4.9.89~147
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14c63f375b9a94cb39f9b8a669a9d6e530e6bfa9;p=platform%2Fkernel%2Flinux-amlogic.git

NFC: pn533: change order of free_irq and dev unregistration


[ 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 <arusalin@dev.rtsoft.ru>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c
index 1dc89248e58e..11d78b43cf76 100644
--- a/drivers/nfc/pn533/i2c.c
+++ b/drivers/nfc/pn533/i2c.c
@@ -242,10 +242,10 @@ static int pn533_i2c_remove(struct i2c_client *client)
 
 	dev_dbg(&client->dev, "%s\n", __func__);
 
-	pn533_unregister_device(phy->priv);
-
 	free_irq(client->irq, phy);
 
+	pn533_unregister_device(phy->priv);
+
 	return 0;
 }