From: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Date: Mon, 17 Jul 2017 17:42:41 +0000 (+0200)
Subject: atm: zatm: Fix an error handling path in 'zatm_init_one()'
X-Git-Tag: microblaze-4.14-rc3~419^2~18
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=799f917233f6ed242ee9416bf80b14819f0c97f3;p=linux-2.6-microblaze.git

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>
---

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;