diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 21:21:36 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 21:21:36 -0500 |
| commit | 98c4514ff6e3072288770db66f91bdb15af8b433 (patch) | |
| tree | eb5f2541e70d27144720e1735b463471025908f0 /arch/arm/mach-at91/at91sam9263_devices.c | |
| parent | 644a9d3b66e6983c2c1f3b24c3006d49b184c871 (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
Merge 3.7-rc6 into char-misc-next
Diffstat (limited to 'arch/arm/mach-at91/at91sam9263_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index cb85da2eccea..9c61e59a2104 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c | |||
| @@ -78,7 +78,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) | |||
| 78 | 78 | ||
| 79 | /* Enable overcurrent notification */ | 79 | /* Enable overcurrent notification */ |
| 80 | for (i = 0; i < data->ports; i++) { | 80 | for (i = 0; i < data->ports; i++) { |
| 81 | if (data->overcurrent_pin[i]) | 81 | if (gpio_is_valid(data->overcurrent_pin[i])) |
| 82 | at91_set_gpio_input(data->overcurrent_pin[i], 1); | 82 | at91_set_gpio_input(data->overcurrent_pin[i], 1); |
| 83 | } | 83 | } |
| 84 | 84 | ||