projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ae5d337
)
can: peak_usb: PCAN-USB specific part: fix little endian usage
author
Stephane Grosjean
<
[email protected]
>
Wed, 7 Mar 2012 14:31:30 +0000
(15:31 +0100)
committer
Marc Kleine-Budde
<
[email protected]
>
Wed, 7 Mar 2012 14:51:01 +0000
(15:51 +0100)
That patch fixes some bad usage of two little-endian variables, which lead to
some warning/error when building the peak_usb driver.
Reported-by: Dan Carpenter <
[email protected]
>
Acked-by: Marc Kleine-Budde <
[email protected]
>
Signed-off-by: Stephane Grosjean <
[email protected]
>
Signed-off-by: Marc Kleine-Budde <
[email protected]
>
drivers/net/can/usb/peak_usb/pcan_usb.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/usb/peak_usb/pcan_usb.c
b/drivers/net/can/usb/peak_usb/pcan_usb.c
index 8a7982e18e4ededc9c13c1d078b0d79508134b20..86f26a1ede4c18a233a85310b0bfb5f9a92da856 100644
(file)
--- a/
drivers/net/can/usb/peak_usb/pcan_usb.c
+++ b/
drivers/net/can/usb/peak_usb/pcan_usb.c
@@
-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_le
32(cf->can_id & CAN_ERR_MASK
);
+ __le16 tmp16 = cpu_to_le
16((cf->can_id & CAN_ERR_MASK) << 5
);
- tmp16 <<= 5;
memcpy(++pc, &tmp16, 2);
pc += 2;
}