From 4559a98eb3fa286e8d49a9c8e85ec0fd7d5553f2 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 2 May 2010 06:10:25 +0200 Subject: [PATCH] --- yaml --- r: 191891 b: refs/heads/master c: fb25cb33096e2f86be5e45fecbc4d20eb66a9953 h: refs/heads/master i: 191889: 81bf7e0e2d84666f5000e6f487593740d6128f0d 191887: b9684ff9195da2600d3730af4a25e812b8c57a04 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/vpac270.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ff4ca6f08825..9d59820f8af9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcc399bb491e0971d84aba593d79d3addf5d31ee +refs/heads/master: fb25cb33096e2f86be5e45fecbc4d20eb66a9953 diff --git a/trunk/arch/arm/mach-pxa/vpac270.c b/trunk/arch/arm/mach-pxa/vpac270.c index 46ad1b7bde85..0954c2433a98 100644 --- a/trunk/arch/arm/mach-pxa/vpac270.c +++ b/trunk/arch/arm/mach-pxa/vpac270.c @@ -359,9 +359,9 @@ static struct platform_device vpac270_gpio_vbus = { static void vpac270_udc_command(int cmd) { if (cmd == PXA2XX_UDC_CMD_CONNECT) - UP2OCR |= UP2OCR_HXOE | UP2OCR_DPPUE | UP2OCR_DPPUBE; + UP2OCR = UP2OCR_HXOE | UP2OCR_DPPUE; else if (cmd == PXA2XX_UDC_CMD_DISCONNECT) - UP2OCR &= ~(UP2OCR_HXOE | UP2OCR_DPPUE | UP2OCR_DPPUBE); + UP2OCR = UP2OCR_HXOE; } static struct pxa2xx_udc_mach_info vpac270_udc_info __initdata = {