diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /drivers/usb/gadget/f_eem.c | |
| parent | ef06f55a5c936a395f3ee2e1237bbebdb4396c65 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/usb/gadget/f_eem.c')
| -rw-r--r-- | drivers/usb/gadget/f_eem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_eem.c b/drivers/usb/gadget/f_eem.c index 38226e9a371d..95dd4662d6a8 100644 --- a/drivers/usb/gadget/f_eem.c +++ b/drivers/usb/gadget/f_eem.c | |||
| @@ -469,8 +469,7 @@ static int eem_unwrap(struct gether *port, | |||
| 469 | crc = get_unaligned_le32(skb->data + len | 469 | crc = get_unaligned_le32(skb->data + len |
| 470 | - ETH_FCS_LEN); | 470 | - ETH_FCS_LEN); |
| 471 | crc2 = ~crc32_le(~0, | 471 | crc2 = ~crc32_le(~0, |
| 472 | skb->data, | 472 | skb->data, len - ETH_FCS_LEN); |
| 473 | skb->len - ETH_FCS_LEN); | ||
| 474 | } else { | 473 | } else { |
| 475 | crc = get_unaligned_be32(skb->data + len | 474 | crc = get_unaligned_be32(skb->data + len |
| 476 | - ETH_FCS_LEN); | 475 | - ETH_FCS_LEN); |