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

Commit e828264e authored by Ian Campbell's avatar Ian Campbell Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: gadget/ether build fixes. 



I also needed the following on 2.6.13-rc1 without CONFIG_USB_ETH_RNDIS,
symbol fs_status_desc isn't available in that case on PXA255.

This builds both with and without ETH_RNDIS, but I haven't actually
tested either.

Signed-off-by: default avatarIan Campbell <icampbell@arcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 05f33400

drivers/usb/gadget/ether.c

+2 −0
Original line number Diff line number Diff line
@@ -954,6 +954,7 @@ set_ether_config (struct eth_dev *dev, unsigned gfp_flags) 
	int					result = 0;

	struct usb_gadget			*gadget = dev->gadget;



#if defined(DEV_CONFIG_CDC) || defined(CONFIG_USB_ETH_RNDIS)

	/* status endpoint used for RNDIS and (optionally) CDC */

	if (!subset_active(dev) && dev->status_ep) {

		dev->status = ep_desc (gadget, &hs_status_desc,
@@ -967,6 +968,7 @@ set_ether_config (struct eth_dev *dev, unsigned gfp_flags) 
			goto done;

		}

	}

#endif



	dev->in = ep_desc (dev->gadget, &hs_source_desc, &fs_source_desc);

	dev->in_ep->driver_data = dev;