aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa_cplds_irqs.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-29 17:48:58 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-29 17:48:58 -0400
commit2a6451718627eb60e85691053cb9820ae7ed3913 (patch)
treefa7d623561434cd556d5693018035c80e1682b30 /arch/arm/mach-pxa/pxa_cplds_irqs.c
parent0f1e5b5d19f6c06fe2078f946377db9861f3910d (diff)
parent5530c84f62b49a2e9f8c11a079d00f85ea20bb09 (diff)
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann: "Two weeks worth of small bug fixes this time, nothing sticking out this time: - one defconfig change to adapt to a modified Kconfig symbol - two fixes for i.MX for backwards compatibility with older DT files that was accidentally broken - one regression fix for irq handling on pxa - three small dt files on omap, and one each for imx and exynos" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: multi_v7_defconfig: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760 ARM: imx6: gpc: don't register power domain if DT data is missing ARM: imx6: allow booting with old DT ARM: dts: set display clock correctly for exynos4412-trats2 ARM: pxa: pxa_cplds: signedness bug in probe ARM: dts: Fix WLAN interrupt line for AM335x EVM-SK ARM: dts: omap3-devkit8000: Fix NAND DT node ARM: dts: am335x-boneblack: disable RTC-only sleep ARM: dts: fix imx27 dtb build rule ARM: dts: imx27: only map 4 Kbyte for fec registers
Diffstat (limited to 'arch/arm/mach-pxa/pxa_cplds_irqs.c')
-rw-r--r--arch/arm/mach-pxa/pxa_cplds_irqs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa_cplds_irqs.c b/arch/arm/mach-pxa/pxa_cplds_irqs.c
index f1aeb54fabe3..2385052b0ce1 100644
--- a/arch/arm/mach-pxa/pxa_cplds_irqs.c
+++ b/arch/arm/mach-pxa/pxa_cplds_irqs.c
@@ -107,7 +107,7 @@ static int cplds_probe(struct platform_device *pdev)
107 struct resource *res; 107 struct resource *res;
108 struct cplds *fpga; 108 struct cplds *fpga;
109 int ret; 109 int ret;
110 unsigned int base_irq = 0; 110 int base_irq;
111 unsigned long irqflags = 0; 111 unsigned long irqflags = 0;
112 112
113 fpga = devm_kzalloc(&pdev->dev, sizeof(*fpga), GFP_KERNEL); 113 fpga = devm_kzalloc(&pdev->dev, sizeof(*fpga), GFP_KERNEL);