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

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

[PATCH] USB: gadgetfs highspeed bugfix 



This catches up to a change in the Kconfig support for highspeed modes;
the change predated 2.6.10, and anyone using gadgetfs on a highspeed
device would see the kernel wrongly reject the alternate descriptors.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 51400f1d

drivers/usb/gadget/inode.c

+12 −12
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) 
		if (value == 0)

			data->state = STATE_EP_ENABLED;

		break;

#ifdef	HIGHSPEED

#ifdef	CONFIG_USB_GADGET_DUALSPEED

	case USB_SPEED_HIGH:

		/* fails if caller didn't provide that descriptor... */

		value = usb_ep_enable (ep, &data->hs_desc);
@@ -982,7 +982,7 @@ ep0_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr) 
			/* assume that was SET_CONFIGURATION */

			if (dev->current_config) {

				unsigned power;

#ifdef	HIGHSPEED

#ifdef	CONFIG_USB_GADGET_DUALSPEED

				if (dev->gadget->speed == USB_SPEED_HIGH)

					power = dev->hs_config->bMaxPower;

				else
@@ -1262,7 +1262,7 @@ static struct file_operations ep0_io_operations = { 
 * Unrecognized ep0 requests may be handled in user space.

 */



#ifdef	HIGHSPEED

#ifdef	CONFIG_USB_GADGET_DUALSPEED

static void make_qualifier (struct dev_data *dev)

{

	struct usb_qualifier_descriptor		qual;
@@ -1291,7 +1291,7 @@ static int 
config_buf (struct dev_data *dev, u8 type, unsigned index)

{

	int		len;

#ifdef HIGHSPEED

#ifdef CONFIG_USB_GADGET_DUALSPEED

	int		hs;

#endif
@@ -1299,7 +1299,7 @@ config_buf (struct dev_data *dev, u8 type, unsigned index) 
	if (index > 0)

		return -EINVAL;



#ifdef HIGHSPEED

#ifdef CONFIG_USB_GADGET_DUALSPEED

	hs = (dev->gadget->speed == USB_SPEED_HIGH);

	if (type == USB_DT_OTHER_SPEED_CONFIG)

		hs = !hs;
@@ -1335,12 +1335,12 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
		dev->state = STATE_CONNECTED;

		dev->dev->bMaxPacketSize0 = gadget->ep0->maxpacket;



#ifdef	HIGHSPEED

#ifdef	CONFIG_USB_GADGET_DUALSPEED

		if (gadget->speed == USB_SPEED_HIGH && dev->hs_config == 0) {

			ERROR (dev, "no high speed config??\n");

			return -EINVAL;

		}

#endif	/* HIGHSPEED */

#endif	/* CONFIG_USB_GADGET_DUALSPEED */



		INFO (dev, "connected\n");

		event = next_event (dev, GADGETFS_CONNECT);
@@ -1352,11 +1352,11 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
			/* ... down_trylock (&data->lock) ... */

			if (data->state != STATE_EP_DEFER_ENABLE)

				continue;

#ifdef	HIGHSPEED

#ifdef	CONFIG_USB_GADGET_DUALSPEED

			if (gadget->speed == USB_SPEED_HIGH)

				value = usb_ep_enable (ep, &data->hs_desc);

			else

#endif	/* HIGHSPEED */

#endif	/* CONFIG_USB_GADGET_DUALSPEED */

				value = usb_ep_enable (ep, &data->desc);

			if (value) {

				ERROR (dev, "deferred %s enable --> %d\n",
@@ -1391,7 +1391,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
			value = min (w_length, (u16) sizeof *dev->dev);

			req->buf = dev->dev;

			break;

#ifdef	HIGHSPEED

#ifdef	CONFIG_USB_GADGET_DUALSPEED

		case USB_DT_DEVICE_QUALIFIER:

			if (!dev->hs_config)

				break;
@@ -1428,7 +1428,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
			// user mode expected to disable endpoints

		} else {

			u8	config, power;

#ifdef	HIGHSPEED

#ifdef	CONFIG_USB_GADGET_DUALSPEED

			if (gadget->speed == USB_SPEED_HIGH) {

				config = dev->hs_config->bConfigurationValue;

				power = dev->hs_config->bMaxPower;
@@ -1728,7 +1728,7 @@ gadgetfs_suspend (struct usb_gadget *gadget) 
}



static struct usb_gadget_driver gadgetfs_driver = {

#ifdef	HIGHSPEED

#ifdef	CONFIG_USB_GADGET_DUALSPEED

	.speed		= USB_SPEED_HIGH,

#else

	.speed		= USB_SPEED_FULL,