Merge commit 'gcl/next' into next

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index fe7e5f35e5d0..494d3f756e29 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -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 @@ free_irq:
         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);