Commit:     8c273033906f8e85d54cb6ae052050f109440171
Parent:     74e8f346d59074147c564d9c1ffd6caf18286516
Author:     David Brownell <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 1 12:45:36 2007 -0700
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Aug 22 14:27:43 2007 -0700

    USB: px2xx_udc bugfix, missing check for gpio_pullup
    git commit b2bbb20b37d734443d1c279d0033a64f6095db54 added direct
    support for PXA GPIO D+ pullup as alternative to the older udc_command
    ops method.  This was done by introduction of the pxa2xx_udc_mach_info
    member "gpio_pullup" which, if initialized, is now used in (almost)
    all places where udc_command used to be called.
    This patch fixes two places where checks for availability of D+ pullup
    control still only honor udc_command.
    Signed-off-by: Uli Luckas <[EMAIL PROTECTED]>
    Signed-off-by: David Brownell <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
 drivers/usb/gadget/pxa2xx_udc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 72b4ebb..1407ad1 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -967,7 +967,7 @@ static int pxa2xx_udc_pullup(struct usb_gadget *_gadget, 
int is_active)
        udc = container_of(_gadget, struct pxa2xx_udc, gadget);
        /* not all boards support pullup control */
-       if (!udc->mach->udc_command)
+       if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
                return -EOPNOTSUPP;
        is_active = (is_active != 0);
@@ -2309,7 +2309,7 @@ static int pxa2xx_udc_suspend(struct platform_device 
*dev, pm_message_t state)
        struct pxa2xx_udc       *udc = platform_get_drvdata(dev);
-       if (!udc->mach->udc_command)
+       if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
                WARN("USB host won't detect disconnect!\n");
        pullup(udc, 0);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to