projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: at91/usbh: fix overcurrent gpio setup
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-at91
/
at91sam9261_devices.c
diff --git
a/arch/arm/mach-at91/at91sam9261_devices.c
b/arch/arm/mach-at91/at91sam9261_devices.c
index
9752f17
..
cd604aa
100644
(file)
--- 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++) {
/* 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);
}
at91_set_gpio_input(data->overcurrent_pin[i], 1);
}
@@
-285,7
+285,7
@@
static struct i2c_gpio_platform_data pdata = {
static struct platform_device at91sam9261_twi_device = {
.name = "i2c-gpio",
static struct platform_device at91sam9261_twi_device = {
.name = "i2c-gpio",
- .id =
-1
,
+ .id =
0
,
.dev.platform_data = &pdata,
};
.dev.platform_data = &pdata,
};
@@
-317,7
+317,7
@@
static struct resource twi_resources[] = {
};
static struct platform_device at91sam9261_twi_device = {
};
static struct platform_device at91sam9261_twi_device = {
- .id =
-1
,
+ .id =
0
,
.resource = twi_resources,
.num_resources = ARRAY_SIZE(twi_resources),
};
.resource = twi_resources,
.num_resources = ARRAY_SIZE(twi_resources),
};