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

Commit 1df879e4 authored by John Linn's avatar John Linn Committed by Grant Likely
Browse files

powerpc/virtex/spi: Xilinx SPI driver not releasing memory 



The driver was not releasing memory when it was removed or
when there was a failure during probe. This fixes it.

Signed-off-by: default avatarJohn Linn <john.linn@xilinx.com>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent e7eec2fc

drivers/spi/xilinx_spi.c

+7 −2
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static int __init xilinx_spi_of_probe(struct of_device *ofdev, 
	if (xspi->regs == NULL) {

		rc = -ENOMEM;

		dev_warn(&ofdev->dev, "ioremap failure\n");

		goto put_master;

		goto release_mem;

	}

	xspi->irq = r_irq->start;
@@ -365,7 +365,7 @@ static int __init xilinx_spi_of_probe(struct of_device *ofdev, 
	prop = of_get_property(ofdev->node, "xlnx,num-ss-bits", &len);

	if (!prop || len < sizeof(*prop)) {

		dev_warn(&ofdev->dev, "no 'xlnx,num-ss-bits' property\n");

		goto put_master;

		goto unmap_io;

	}

	master->num_chipselect = *prop;
@@ -397,6 +397,8 @@ static int __init xilinx_spi_of_probe(struct of_device *ofdev, 
	free_irq(xspi->irq, xspi);

unmap_io:

	iounmap(xspi->regs);

release_mem:

	release_mem_region(r_mem->start, resource_size(r_mem));

put_master:

	spi_master_put(master);

	return rc;
@@ -406,6 +408,7 @@ static int __devexit xilinx_spi_remove(struct of_device *ofdev) 
{

	struct xilinx_spi *xspi;

	struct spi_master *master;

	struct resource r_mem;



	master = platform_get_drvdata(ofdev);

	xspi = spi_master_get_devdata(master);
@@ -413,6 +416,8 @@ static int __devexit xilinx_spi_remove(struct of_device *ofdev) 
	spi_bitbang_stop(&xspi->bitbang);

	free_irq(xspi->irq, xspi);

	iounmap(xspi->regs);

	if (!of_address_to_resource(ofdev->node, 0, &r_mem))

		release_mem_region(r_mem.start, resource_size(&r_mem));

	dev_set_drvdata(&ofdev->dev, 0);

	spi_master_put(xspi->bitbang.master);