diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-10 10:52:59 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-10 10:52:59 +0200 |
| commit | b920eb41a8241c54efbbd4f2ed6d074f497b0d9e (patch) | |
| tree | 5941091817e932add192f8e58dc88d483322e214 /arch/arm/mach-at91/at91sam9261_devices.c | |
| parent | regulator: Fix build error for mc13783 and mc13892 (diff) | |
| parent | Linux 3.4-rc2 (diff) | |
| download | linux-b920eb41a8241c54efbbd4f2ed6d074f497b0d9e.tar.xz linux-b920eb41a8241c54efbbd4f2ed6d074f497b0d9e.zip | |
Merge tag 'v3.4-rc2' into regulator-drivers
Linux 3.4-rc2 contains some fixes that further patches depend upon.
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 096da87dc00d..4db961a93085 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -415,6 +415,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 |