aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/janz-ican3.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/can/janz-ican3.c')
-rw-r--r--drivers/net/can/janz-ican3.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index 754b803fa926..b19aca591c7a 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -811,10 +811,10 @@ static void ican3_to_can_frame(struct ican3_dev *mod,
811 811
812 cf->can_id |= desc->data[0] << 3; 812 cf->can_id |= desc->data[0] << 3;
813 cf->can_id |= (desc->data[1] & 0xe0) >> 5; 813 cf->can_id |= (desc->data[1] & 0xe0) >> 5;
814 cf->can_dlc = desc->data[1] & ICAN3_CAN_DLC_MASK; 814 cf->can_dlc = get_can_dlc(desc->data[1] & ICAN3_CAN_DLC_MASK);
815 memcpy(cf->data, &desc->data[2], sizeof(cf->data)); 815 memcpy(cf->data, &desc->data[2], cf->can_dlc);
816 } else { 816 } else {
817 cf->can_dlc = desc->data[0] & ICAN3_CAN_DLC_MASK; 817 cf->can_dlc = get_can_dlc(desc->data[0] & ICAN3_CAN_DLC_MASK);
818 if (desc->data[0] & ICAN3_EFF_RTR) 818 if (desc->data[0] & ICAN3_EFF_RTR)
819 cf->can_id |= CAN_RTR_FLAG; 819 cf->can_id |= CAN_RTR_FLAG;
820 820
@@ -829,7 +829,7 @@ static void ican3_to_can_frame(struct ican3_dev *mod,
829 cf->can_id |= desc->data[3] >> 5; /* 2-0 */ 829 cf->can_id |= desc->data[3] >> 5; /* 2-0 */
830 } 830 }
831 831
832 memcpy(cf->data, &desc->data[6], sizeof(cf->data)); 832 memcpy(cf->data, &desc->data[6], cf->can_dlc);
833 } 833 }
834} 834}
835 835
@@ -861,7 +861,7 @@ static void can_frame_to_ican3(struct ican3_dev *mod,
861 } 861 }
862 862
863 /* copy the data bits into the descriptor */ 863 /* copy the data bits into the descriptor */
864 memcpy(&desc->data[6], cf->data, sizeof(cf->data)); 864 memcpy(&desc->data[6], cf->data, cf->can_dlc);
865} 865}
866 866
867/* 867/*