Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbae0203 authored by Mark Brown's avatar Mark Brown Committed by Russell King
Browse files

[ARM] 5108/2: PXA SSP: Don't unconditionally free interrupt 



Callers may stop the SSP core requesting the interrupt so it can't be
freed unconditionally.  Also use NO_IRQ like we should.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 20072fd0

arch/arm/mach-pxa/ssp.c

+3 −2
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ int ssp_init(struct ssp_dev *dev, u32 port, u32 init_flags) 
			goto out_region;

		dev->irq = ssp->irq;

	} else

		dev->irq = 0;

		dev->irq = NO_IRQ;



	/* turn on SSP port clock */

	clk_enable(ssp->clk);
@@ -306,6 +306,7 @@ void ssp_exit(struct ssp_dev *dev) 
	struct ssp_device *ssp = dev->ssp;



	ssp_disable(dev);

	if (dev->irq != NO_IRQ)

		free_irq(dev->irq, dev);

	clk_disable(ssp->clk);

	ssp_free(ssp);