aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Jaillet <christophe.jaillet@wanadoo.fr>2017-07-17 19:42:41 +0200
committerDavid S. Miller <davem@davemloft.net>2017-07-18 11:37:46 -0700
commit799f917233f6ed242ee9416bf80b14819f0c97f3 (patch)
tree19633dca9c18f5b69ba269c3c5e9918b20dbe149
parentipv4: ipv6: initialize treq->txhash in cookie_v[46]_check() (diff)
downloadlinux-dev-799f917233f6ed242ee9416bf80b14819f0c97f3.tar.xz
linux-dev-799f917233f6ed242ee9416bf80b14819f0c97f3.zip
atm: zatm: Fix an error handling path in 'zatm_init_one()'
If 'dma_set_mask_and_coherent()' fails, we must undo the previous 'pci_request_regions()' call. Adjust corresponding 'goto' to jump at the right place of the error handling path. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/atm/zatm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 292dec18ffb8..07bdd51b3b9a 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;