diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-05 14:43:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-05 14:43:20 -0500 |
| commit | c84e6d01eed16afa41a1c4ad9a6bd6a8bfe67af0 (patch) | |
| tree | 85fd4d6ddaaf7374bd1a6ab9d849ed002cf9a433 | |
| parent | b772b8e3abb9e14f39a97a5e318e466ce96d8daf (diff) | |
| parent | c9bb86338a6bb91e4d32db04feb6b8d423e04d06 (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Ingo Molnar:
"An irqchip driver init fix"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/irq-mvebu-gicp: Add missing spin_lock init
| -rw-r--r-- | drivers/irqchip/irq-mvebu-gicp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-mvebu-gicp.c b/drivers/irqchip/irq-mvebu-gicp.c index b283fc90be1e..17a4a7b6cdbb 100644 --- a/drivers/irqchip/irq-mvebu-gicp.c +++ b/drivers/irqchip/irq-mvebu-gicp.c | |||
| @@ -194,6 +194,7 @@ static int mvebu_gicp_probe(struct platform_device *pdev) | |||
| 194 | return -ENOMEM; | 194 | return -ENOMEM; |
| 195 | 195 | ||
| 196 | gicp->dev = &pdev->dev; | 196 | gicp->dev = &pdev->dev; |
| 197 | spin_lock_init(&gicp->spi_lock); | ||
| 197 | 198 | ||
| 198 | gicp->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 199 | gicp->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 199 | if (!gicp->res) | 200 | if (!gicp->res) |