system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-24 05:17:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

Browse source
This commit is contained in:
David S. Miller 2012-03-15 14:34:07 -07:00
parent cdf485be3a 1ccba2103a
commit 1174764e81
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/can/usb/peak_usb/pcan_usb.c
View file

@ -741,16 +741,14 @@ static int pcan_usb_encode_msg(struct peak_usb_device *dev, struct sk_buff *skb,
/* can id */
if (cf->can_id & CAN_EFF_FLAG) {
__le32 tmp32 = cpu_to_le32(cf->can_id & CAN_ERR_MASK);
__le32 tmp32 = cpu_to_le32((cf->can_id & CAN_ERR_MASK) << 3);
tmp32 <<= 3;
*pc |= PCAN_USB_STATUSLEN_EXT_ID;
memcpy(++pc, &tmp32, 4);
pc += 4;
} else {
__le16 tmp16 = cpu_to_le32(cf->can_id & CAN_ERR_MASK);
__le16 tmp16 = cpu_to_le16((cf->can_id & CAN_ERR_MASK) << 5);
tmp16 <<= 5;
memcpy(++pc, &tmp16, 2);
pc += 2;
}