summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91sam9rl_devices.c
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2012-03-28 11:58:58 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2012-04-04 18:35:52 +0200
commit0c2c1f624d4f99825851f0253f1308dd591df6ef (patch)
tree0a0279e1e48ee8e0293fd4370d558dda803eb7d2 /arch/arm/mach-at91/at91sam9rl_devices.c
parentUSB: ehci-atmel: add needed of.h header file (diff)
downloadlinux-0c2c1f624d4f99825851f0253f1308dd591df6ef.tar.xz
linux-0c2c1f624d4f99825851f0253f1308dd591df6ef.zip
ARM: at91: fix check of valid GPIO for SPI and USB
SPI chip select pins have to be checked by gpio_is_valid(). The USB host overcurrent_pin checking was missing. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9rl_devices.c')
-rw-r--r--arch/arm/mach-at91/at91sam9rl_devices.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index eda72e83037d..fe4ae22e8561 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -419,6 +419,9 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
else
cs_pin = spi_standard_cs[devices[i].chip_select];
+ if (!gpio_is_valid(cs_pin))
+ continue;
+
/* enable chip-select pin */
at91_set_gpio_output(cs_pin, 1);