path: root/drivers/net/ethernet/seeq
diff options
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2019-08-31 09:17:51 +0200
committerDavid S. Miller <davem@davemloft.net>2019-09-01 12:10:11 -0700
commite1e54ec7fb55501c33b117c111cb0a045b8eded2 (patch)
tree632253e7c74f8069a044fc0c8e5e87c673025277 /drivers/net/ethernet/seeq
parentenetc: Add missing call to 'pci_free_irq_vectors()' in probe and remove functions (diff)
net: seeq: Fix the function used to release some memory in an error handling path
In commit 99cd149efe82 ("sgiseeq: replace use of dma_cache_wback_inv"), a call to 'get_zeroed_page()' has been turned into a call to 'dma_alloc_coherent()'. Only the remove function has been updated to turn the corresponding 'free_page()' into 'dma_free_attrs()'. The error hndling path of the probe function has not been updated. Fix it now. Rename the corresponding label to something more in line. Fixes: 99cd149efe82 ("sgiseeq: replace use of dma_cache_wback_inv") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/seeq')
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c
index 7a5e6c5abb57..276c7cae7cee 100644
--- a/drivers/net/ethernet/seeq/sgiseeq.c
+++ b/drivers/net/ethernet/seeq/sgiseeq.c
@@ -794,15 +794,16 @@ static int sgiseeq_probe(struct platform_device *pdev)
printk(KERN_ERR "Sgiseeq: Cannot register net device, "
err = -ENODEV;
- goto err_out_free_page;
+ goto err_out_free_attrs;
printk(KERN_INFO "%s: %s %pM\n", dev->name, sgiseeqstr, dev->dev_addr);
return 0;
- free_page((unsigned long) sp->srings);
+ dma_free_attrs(&pdev->dev, sizeof(*sp->srings), sp->srings,
+ sp->srings_dma, DMA_ATTR_NON_CONSISTENT);