diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-12-21 13:46:30 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-12-21 13:46:30 +0300 |
| commit | 1d9d4495001d3c470e5c902ff35a6aa626924fc1 (patch) | |
| tree | 1ae39f4ccadb610bc16fea88a1f93b23a4df37b1 /drivers/net/can/ti_hecc.c | |
| parent | d3d33aabac51341065bcce0e9c2d9d27902a08c4 (diff) | |
| parent | e2dc7d7d8ed3019f72855af1c3dcda3fb456b488 (diff) | |
| download | linux-1d9d4495001d3c470e5c902ff35a6aa626924fc1.tar.xz | |
Merge branch 'topic/hdmi-jack' into for-next
Diffstat (limited to 'drivers/net/can/ti_hecc.c')
| -rw-r--r-- | drivers/net/can/ti_hecc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c index cf345cbfe819..680d1ff07a55 100644 --- a/drivers/net/can/ti_hecc.c +++ b/drivers/net/can/ti_hecc.c @@ -722,7 +722,6 @@ static int ti_hecc_error(struct net_device *ndev, int int_status, if (err_status & HECC_BUS_ERROR) { ++priv->can.can_stats.bus_error; cf->can_id |= CAN_ERR_BUSERROR | CAN_ERR_PROT; - cf->data[2] |= CAN_ERR_PROT_UNSPEC; if (err_status & HECC_CANES_FE) { hecc_set_bit(priv, HECC_CANES, HECC_CANES_FE); cf->data[2] |= CAN_ERR_PROT_FORM; @@ -737,13 +736,11 @@ static int ti_hecc_error(struct net_device *ndev, int int_status, } if (err_status & HECC_CANES_CRCE) { hecc_set_bit(priv, HECC_CANES, HECC_CANES_CRCE); - cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ | - CAN_ERR_PROT_LOC_CRC_DEL; + cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ; } if (err_status & HECC_CANES_ACKE) { hecc_set_bit(priv, HECC_CANES, HECC_CANES_ACKE); - cf->data[3] |= CAN_ERR_PROT_LOC_ACK | - CAN_ERR_PROT_LOC_ACK_DEL; + cf->data[3] = CAN_ERR_PROT_LOC_ACK; } } |