diff options
| author | David S. Miller <davem@davemloft.net> | 2017-07-21 03:38:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-21 03:38:43 +0100 |
| commit | 7a68ada6ec7d88c68057d3a4c2a517eb94289976 (patch) | |
| tree | 51cd586e74fc92bfbdf382fa1544a235d908b25c /drivers/atm/zatm.c | |
| parent | 760446f967678e14ee1b6464ee1bb8562f299fa6 (diff) | |
| parent | 96080f697786e0a30006fcbcc5b53f350fcb3e9f (diff) | |
| download | linux-7a68ada6ec7d88c68057d3a4c2a517eb94289976.tar.gz linux-7a68ada6ec7d88c68057d3a4c2a517eb94289976.tar.bz2 linux-7a68ada6ec7d88c68057d3a4c2a517eb94289976.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/atm/zatm.c')
| -rw-r--r-- | drivers/atm/zatm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c index d3aa7482d1f7..1ef67db03c8e 100644 --- a/drivers/atm/zatm.c +++ b/drivers/atm/zatm.c @@ -1613,7 +1613,7 @@ static int zatm_init_one(struct pci_dev *pci_dev, ret = dma_set_mask_and_coherent(&pci_dev->dev, DMA_BIT_MASK(32)); if (ret < 0) - goto out_disable; + goto out_release; zatm_dev->pci_dev = pci_dev; dev->dev_data = zatm_dev; |