dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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: Ian Campbell <icampbell@arcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ian Campbell 2005-06-29 10:20:29 +01:00 committed by Greg Kroah-Hartman
parent 05f3340030
commit e828264ee7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/gadget/ether.c
View File

@ -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;