From 0a62cb99dd903715f549525a2eecea008fc495d6 Mon Sep 17 00:00:00 2001
From: Brian Niebuhr <bniebuhr3@gmail.com>
Date: Mon, 25 Jan 2010 14:45:40 -0600
Subject: [PATCH] --- yaml --- r: 180629 b: refs/heads/master c:
 31e5d4abceaa3d11ff583ddf76ec292e90eacb7d h: refs/heads/master i:   180627:
 1265013469a37c300fb5f0e364516547d293e778 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/gadget/f_eem.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 51d35ab15e94..26314a062343 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd091c7b3280d4811b855d034fa91519fd3485ef
+refs/heads/master: 31e5d4abceaa3d11ff583ddf76ec292e90eacb7d
diff --git a/trunk/drivers/usb/gadget/f_eem.c b/trunk/drivers/usb/gadget/f_eem.c
index 0a577d5694fd..d4f0db58a8ad 100644
--- a/trunk/drivers/usb/gadget/f_eem.c
+++ b/trunk/drivers/usb/gadget/f_eem.c
@@ -358,7 +358,7 @@ static struct sk_buff *eem_wrap(struct gether *port, struct sk_buff *skb)
 	 * b15:		bmType (0 == data)
 	 */
 	len = skb->len;
-	put_unaligned_le16((len & 0x3FFF) | BIT(14), skb_push(skb, 2));
+	put_unaligned_le16(len & 0x3FFF, skb_push(skb, 2));
 
 	/* add a zero-length EEM packet, if needed */
 	if (padlen)
@@ -464,7 +464,6 @@ static int eem_unwrap(struct gether *port,
 			}
 
 			/* validate CRC */
-			crc = get_unaligned_le32(skb->data + len - ETH_FCS_LEN);
 			if (header & BIT(14)) {
 				crc = get_unaligned_le32(skb->data + len
 							- ETH_FCS_LEN);