Merge remote-tracking branches 'spi/topic/devprop', 'spi/topic/fsl', 'spi/topic/fsl...

[sfrench/cifs-2.6.git] / drivers / spi / spi-fsl-spi.c

diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 0fc3452652aee4fad412d74398ff6dd13f1ceb96..8f2e97857e8bccfc6db0563c86f21c36fa3cc554 100644 (file)
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -814,7 +814,7 @@ static int of_fsl_spi_probe(struct platform_device *ofdev)
        struct device_node *np = ofdev->dev.of_node;
        struct spi_master *master;
        struct resource mem;
-       int irq, type;
+       int irq = 0, type;
        int ret = -ENOMEM;
 
        ret = of_mpc8xxx_spi_probe(ofdev);
@@ -847,6 +847,7 @@ static int of_fsl_spi_probe(struct platform_device *ofdev)
        return 0;
 
 err:
+       irq_dispose_mapping(irq);
        if (type == TYPE_FSL)
                of_fsl_spi_free_chipselects(dev);
        return ret;