diff options
author | Olof Johansson <olof@lixom.net> | 2013-12-04 12:18:50 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-12-04 12:18:50 -0800 |
commit | fa22f66b82de3576aa1c35f116a8b3824ed9e123 (patch) | |
tree | aafa84003d2ee5a4f04dfed8b7ca44bbc979faac /arch/arm/mach-davinci/dm365.c | |
parent | 3843114856728075d0a80e7151197c19fb3a9e08 (diff) | |
parent | e462f1f5174893f3f5efd03a31ca014b02120f9a (diff) | |
download | linux-fa22f66b82de3576aa1c35f116a8b3824ed9e123.tar.bz2 |
Merge tag 'davinci-fixes-for-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
From Sekhar Nori:
This pull request contains a fixe for broken unbanked
GPIO IRQ support and a fix for some random memory
corruption. The bugs were introduced during v3.13
merge window.
* tag 'davinci-fixes-for-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: fix number of resources passed to davinci_gpio_register()
gpio: davinci: fix check for unbanked gpio
Diffstat (limited to 'arch/arm/mach-davinci/dm365.c')
-rw-r--r-- | arch/arm/mach-davinci/dm365.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 1511a0680f9a..9c9652044885 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -720,7 +720,7 @@ static struct davinci_gpio_platform_data dm365_gpio_platform_data = { int __init dm365_gpio_register(void) { return davinci_gpio_register(dm365_gpio_resources, - sizeof(dm365_gpio_resources), + ARRAY_SIZE(dm365_gpio_resources), &dm365_gpio_platform_data); } |