diff options
| author |   Liu Xiang <liu.xiang6@zte.com.cn> | 2017-03-09 22:40:01 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-03-13 16:16:08 +0000 |
| commit | 500a32abaf818b3f4afe5b7f0ba9ca9b7a3aa65e (patch) | |
| tree | 19a834f613a5b9a83306329f58ac3758d9d8cd34 /drivers/spi | |
| parent | Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/sunxi', 'spi/topic/ti-qspi', 'spi/topic/topcliff-pch' and 'spi/topic/xlp' into spi-next (diff) | |
| download | linux-dev-500a32abaf818b3f4afe5b7f0ba9ca9b7a3aa65e.tar.xz linux-dev-500a32abaf818b3f4afe5b7f0ba9ca9b7a3aa65e.zip | |
spi: fsl: Call irq_dispose_mapping in err path
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>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-fsl-spi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c index 8b290d9d7935..592034320a41 100644 --- a/drivers/spi/spi-fsl-spi.c +++ b/drivers/spi/spi-fsl-spi.c @@ -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; |