summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
index 70ffff724a26..07d2f3aa2c02 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
@@ -125,16 +125,8 @@ struct kvaser_cmd_simple {
struct kvaser_cmd_cardinfo {
u8 tid;
u8 nchannels;
- union {
- struct {
- __le32 serial_number;
- __le32 padding;
- } __packed leaf0;
- struct {
- __le32 serial_number_low;
- __le32 serial_number_high;
- } __packed usbcan0;
- } __packed;
+ __le32 serial_number;
+ __le32 padding0;
__le32 clock_resolution;
__le32 mfgdate;
u8 ean[8];
@@ -147,7 +139,7 @@ struct kvaser_cmd_cardinfo {
u8 padding;
} __packed usbcan1;
} __packed;
- __le16 padding;
+ __le16 padding1;
} __packed;
struct leaf_cmd_softinfo {