]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
spi: fsl: Call irq_dispose_mapping in err path
authorLiu Xiang <liu.xiang6@zte.com.cn>
Thu, 9 Mar 2017 14:40:01 +0000 (22:40 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 13 Mar 2017 16:16:08 +0000 (16:16 +0000)
Irq_dispose_mapping should be called in err path to release
the resources that irq_of_parse_and_map requested.

Signed-off-by: Liu Xiang <liu.xiang6@zte.com.cn>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-fsl-spi.c

index 8b290d9d7935044640da36688e82fd01e90bf114..592034320a4133f0862b551aadcaf21b0e3e3c00 100644 (file)
@@ -813,7 +813,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);
@@ -846,6 +846,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;