From: Ian Campbell <icampbell@arcom.com>
Date: Wed, 29 Jun 2005 09:15:32 +0000 (+0100)
Subject: [PATCH] USB: gadget/ether fixes
X-Git-Tag: v2.6.13-rc3~70
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=05f33400307cfe9d89dbeca659731b9055fefbf8;p=linux-2.6-omap-h63xx.git

[PATCH] USB: gadget/ether fixes

Signed-off-by: Ian Campbell <icampbell@arcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 00a5d256626..b5647b50336 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2428,7 +2428,7 @@ autoconf_fail:
 	dev->req->complete = eth_setup_complete;
 
 	/* ... and maybe likewise for status transfer */
-#ifdef DEV_CONFIG_CDC
+#if defined(DEV_CONFIG_CDC) || defined(CONFIG_USB_ETH_RNDIS)
 	if (dev->status_ep) {
 		dev->stat_req = eth_req_alloc (dev->status_ep,
 					STATUS_BYTECOUNT, GFP_KERNEL);