diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 16:43:58 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 16:43:58 +0100 |
| commit | 6658d6a5957662d0b9b2da8cc2466de2dad09a1a (patch) | |
| tree | 1b7f1c346ac4ef98fb287e228930d66f3709c75f /arch/arm/mach-at91/at91sam9261_devices.c | |
| parent | 57260e4088894de25bb1837d529708c3ec705a69 (diff) | |
| parent | 641f3ce64b050961d454a0716bb6dbf528315aac (diff) | |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixesfixes-for-3.7
From Nicolas Ferre <nicolas.ferre@atmel.com>:
Two little fixes, one related to the move to sparse irq and
another one fixing the check of a GPIO for USB host overcurrent.
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91/usbh: fix overcurrent gpio setup
ARM: at91/AT91SAM9G45: fix crypto peripherals irq issue due to sparse irq support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index b9487696b7be..cd604aad8e96 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -72,7 +72,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) /* Enable overcurrent notification */ for (i = 0; i < data->ports; i++) { - if (data->overcurrent_pin[i]) + if (gpio_is_valid(data->overcurrent_pin[i])) at91_set_gpio_input(data->overcurrent_pin[i], 1); } |