git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/asoc' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-at91
/
at91sam9rl_devices.c
diff --git
a/arch/arm/mach-at91/at91sam9rl_devices.c
b/arch/arm/mach-at91/at91sam9rl_devices.c
index eda72e83037dc7dd176c859e7f4ad874a9506a75..fe4ae22e8561bc9084b9d64870d063cfca88ed9a 100644
(file)
--- 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);