SPI: spi-au1550: Fix build problem in au1550_spi_remove
diff mbox

Message ID 1408545613-28348-1-git-send-email-markos.chandras@imgtec.com
State New, archived
Headers show

Commit Message

Markos Chandras Aug. 20, 2014, 2:40 p.m. UTC
Commit 30670539b867 ("spi: au1550: Fix bug in deallocation of memory")
switched from release_resource to release_mem_region to release
memory regions allocated using the request_mem_region. However,
a build problem was introduced due to 'r' being undefined in that
function. We fix this by having 'r' being defined as the platform's
IORESROUCE_MEM region.

This fixes a problem triggered by the db1xxx defconfig in the MIPS tree:

drivers/spi/spi-au1550.c: In function 'au1550_spi_remove':
drivers/spi/spi-au1550.c:948:21: error: 'r' undeclared (first use in this
							function)
release_mem_region(r->start, sizeof(psc_spi_t));

Cc: Mark Brown <broonie@kernel.org>
Cc: Himangi Saraogi <himangi774@gmail.com>
Cc: linux-spi@vger.kernel.org
Cc: linux-mips@linux-mips.org
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
This has only been compile tested
---
 drivers/spi/spi-au1550.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Mark Brown Aug. 20, 2014, 3:33 p.m. UTC | #1
On Wed, Aug 20, 2014 at 03:40:13PM +0100, Markos Chandras wrote:
> Commit 30670539b867 ("spi: au1550: Fix bug in deallocation of memory")
> switched from release_resource to release_mem_region to release
> memory regions allocated using the request_mem_region. However,
> a build problem was introduced due to 'r' being undefined in that
> function. We fix this by having 'r' being defined as the platform's
> IORESROUCE_MEM region.

A different fix has already been sent for htis issue - please check if
there's anything you want to change with that and resubmit if there's
anything.

Patch
diff mbox

diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c
index 40c3d43c9292..f7edb504df78 100644
--- a/drivers/spi/spi-au1550.c
+++ b/drivers/spi/spi-au1550.c
@@ -937,6 +937,7 @@  err_nomem:
 
 static int au1550_spi_remove(struct platform_device *pdev)
 {
+	struct resource *r;
 	struct au1550_spi *hw = platform_get_drvdata(pdev);
 
 	dev_info(&pdev->dev, "spi master remove: bus_num=%d\n",
@@ -945,6 +946,13 @@  static int au1550_spi_remove(struct platform_device *pdev)
 	spi_bitbang_stop(&hw->bitbang);
 	free_irq(hw->irq, hw);
 	iounmap((void __iomem *)hw->regs);
+
+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!r) {
+		dev_err(&pdev->dev, "no mmio resource\n");
+		return -ENODEV;
+	}
+
 	release_mem_region(r->start, sizeof(psc_spi_t));
 
 	if (hw->usedma) {