projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.10.108' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
net
/
can
/
usb
/
esd_usb2.c
diff --git
a/drivers/net/can/usb/esd_usb2.c
b/drivers/net/can/usb/esd_usb2.c
index d5455c7606187551effafa94138d0fddd7aad506..503f37850fb3d50b20835b291d8f9c9fda125100 100644
(file)
--- a/
drivers/net/can/usb/esd_usb2.c
+++ b/
drivers/net/can/usb/esd_usb2.c
@@
-335,7
+335,7
@@
static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv,
}
cf->can_id = id & ESD_IDMASK;
- cf->can_dlc = get_can_dlc(msg->msg.rx.dlc);
+ cf->can_dlc = get_can_dlc(msg->msg.rx.dlc
& ~ESD_RTR
);
if (id & ESD_EXTID)
cf->can_id |= CAN_EFF_FLAG;