diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-04-13 15:27:28 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-04-13 15:27:35 +1000 |
commit | 4df1b81b9746e9960d171d9c35d9311182fc9e3f (patch) | |
tree | 1061424aeb7bc2cc65b46c1516f9397a25a2d4c1 /drivers/usb/musb/blackfin.c | |
parent | 0169b0812e1a237b6e493f118e89ebb3c4abdd4d (diff) | |
parent | 50be717773eb1d77d0a02f1b307cfe7b36121d03 (diff) |
Merge branch 'quilt/usb'
Diffstat (limited to 'drivers/usb/musb/blackfin.c')
-rw-r--r-- | drivers/usb/musb/blackfin.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c index 719a22d664ef..6f8e864a0ec0 100644 --- a/drivers/usb/musb/blackfin.c +++ b/drivers/usb/musb/blackfin.c @@ -244,10 +244,10 @@ static void bfin_vbus_power(struct musb *musb, int is_on, int sleeping) static void bfin_set_vbus(struct musb *musb, int is_on) { - if (is_on) - gpio_set_value(musb->config->gpio_vrsel, 1); - else - gpio_set_value(musb->config->gpio_vrsel, 0); + int value = musb->config->gpio_vrsel_active; + if (!is_on) + value = !value; + gpio_set_value(musb->config->gpio_vrsel, value); DBG(1, "VBUS %s, devctl %02x " /* otg %3x conf %08x prcm %08x */ "\n", @@ -276,7 +276,7 @@ int musb_platform_set_mode(struct musb *musb, u8 musb_mode) return -EIO; } -int __init musb_platform_init(struct musb *musb) +int __init musb_platform_init(struct musb *musb, void *board_data) { /* |