Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c273033 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

USB: px2xx_udc bugfix, missing check for gpio_pullup 



git commit b2bbb20b 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: default avatarUli Luckas <u.luckas@road.de>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 74e8f346

drivers/usb/gadget/pxa2xx_udc.c

+2 −2
Original line number Diff line number Diff line
@@ -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);