From 4f7ae08302ae0392b79411717800a31c5e745ef8 Mon Sep 17 00:00:00 2001
From: Maxim Osipov <maxim.osipov@gmail.com>
Date: Sat, 21 Aug 2010 14:54:06 +0400
Subject: [PATCH] --- yaml --- r: 210217 b: refs/heads/master c:
 037d3656adbd7e8cb848f01cf5dec423ed76bbe7 h: refs/heads/master i:   210215:
 be07f81b388b25b5db5d004957c80fb9536b5e94 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/usb/gadget/rndis.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1e6ded147230..ffefce318729 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 793f03aa7bda8f492e12ada3de711b4ad7f4d8d0
+refs/heads/master: 037d3656adbd7e8cb848f01cf5dec423ed76bbe7
diff --git a/trunk/drivers/usb/gadget/rndis.c b/trunk/drivers/usb/gadget/rndis.c
index ee337f72c644..972d5ddd1e18 100644
--- a/trunk/drivers/usb/gadget/rndis.c
+++ b/trunk/drivers/usb/gadget/rndis.c
@@ -293,9 +293,13 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
 	/* mandatory */
 	case OID_GEN_VENDOR_DESCRIPTION:
 		pr_debug("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__);
-		length = strlen (rndis_per_dev_params [configNr].vendorDescr);
-		memcpy (outbuf,
-			rndis_per_dev_params [configNr].vendorDescr, length);
+		if ( rndis_per_dev_params [configNr].vendorDescr ) {
+			length = strlen (rndis_per_dev_params [configNr].vendorDescr);
+			memcpy (outbuf,
+				rndis_per_dev_params [configNr].vendorDescr, length);
+		} else {
+			outbuf[0] = 0;
+		}
 		retval = 0;
 		break;