diff options
| author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 08:26:10 +0100 |
|---|---|---|
| committer | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 08:26:10 +0100 |
| commit | d121f07691415df824e6b60520f782f6d13b3c81 (patch) | |
| tree | 422ad3cc6fd631604fef4e469e49bacba8202e52 /drivers/net/hippi/rrunner.c | |
| parent | libnvdimm, namespace: remove redundant initialization of 'nd_mapping' (diff) | |
| parent | dax: require 'struct page' by default for filesystem dax (diff) | |
| download | linux-d121f07691415df824e6b60520f782f6d13b3c81.tar.xz linux-d121f07691415df824e6b60520f782f6d13b3c81.zip | |
Merge branch 'for-4.16/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/net/hippi/rrunner.c')
| -rw-r--r-- | drivers/net/hippi/rrunner.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c index 8483f03d5a41..1ab97d99b9ba 100644 --- a/drivers/net/hippi/rrunner.c +++ b/drivers/net/hippi/rrunner.c @@ -1379,8 +1379,8 @@ static int rr_close(struct net_device *dev) rrpriv->info_dma); rrpriv->info = NULL; - free_irq(pdev->irq, dev); spin_unlock_irqrestore(&rrpriv->lock, flags); + free_irq(pdev->irq, dev); return 0; } |