diff options
| author | Andrey Rusalin <arusalin@dev.rtsoft.ru> | 2016-12-28 18:10:57 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2017-04-02 01:06:21 +0200 |
| commit | 068a496c4525c638ffab56449d905b88ef97fe32 (patch) | |
| tree | 4d5652fdf8e2f47b3479921d3902dc211c578754 /drivers/nfc/pn533/i2c.c | |
| parent | nfc: fdp: fix NULL pointer dereference (diff) | |
| download | linux-068a496c4525c638ffab56449d905b88ef97fe32.tar.xz linux-068a496c4525c638ffab56449d905b88ef97fe32.zip | |
NFC: pn533: change order of free_irq and dev unregistration
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>
Diffstat (limited to 'drivers/nfc/pn533/i2c.c')
| -rw-r--r-- | drivers/nfc/pn533/i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |