[PATCH 4.9 092/241] NFC: pn533: change order of free_irq and dev unregistration

From: Greg Kroah-Hartman
Date: Mon Mar 19 2018 - 15:38:24 EST


4.9-stable review patch. If anyone has any objections, please let me know.

------------------

From: Andrey Rusalin <arusalin@xxxxxxxxxxxxx>


[ 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@xxxxxxxxxxxxx>
Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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;
}