diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-28 09:58:58 (GMT) |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-04-04 16:35:52 (GMT) |
commit | 0c2c1f624d4f99825851f0253f1308dd591df6ef (patch) | |
tree | 0a0279e1e48ee8e0293fd4370d558dda803eb7d2 /arch/arm/mach-at91/at91sam9260_devices.c | |
parent | 9475375a5eb2ab9380e644d45173f67cbca0da80 (diff) | |
download | linux-0c2c1f624d4f99825851f0253f1308dd591df6ef.tar.xz |
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/at91sam9260_devices.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9260_devices.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 7e5651e..5652dde 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -598,6 +598,9 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) else cs_pin = spi1_standard_cs[devices[i].chip_select]; + if (!gpio_is_valid(cs_pin)) + continue; + if (devices[i].bus_num == 0) enable_spi0 = 1; else |