Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1e54ec7 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by David S. Miller
Browse files

net: seeq: Fix the function used to release some memory in an error handling path 



In commit 99cd149e ("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: 99cd149e ("sgiseeq: replace use of dma_cache_wback_inv")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd7078f0

drivers/net/ethernet/seeq/sgiseeq.c

+4 −3
Original line number Diff line number Diff line
@@ -794,15 +794,16 @@ static int sgiseeq_probe(struct platform_device *pdev) 
		printk(KERN_ERR "Sgiseeq: Cannot register net device, "

		       "aborting.\n");

		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;



err_out_free_page:

	free_page((unsigned long) sp->srings);

err_out_free_attrs:

	dma_free_attrs(&pdev->dev, sizeof(*sp->srings), sp->srings,

		       sp->srings_dma, DMA_ATTR_NON_CONSISTENT);

err_out_free_dev:

	free_netdev(dev);