diff options
Diffstat (limited to 'drivers/net/can/flexcan.c')
-rw-r--r-- | drivers/net/can/flexcan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 35bcf97e0ce1..0056d762edee 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -210,7 +210,7 @@ #define FLEXCAN_MB_CNT_LENGTH(x) (((x) & 0xf) << 16) #define FLEXCAN_MB_CNT_TIMESTAMP(x) ((x) & 0xffff) -#define FLEXCAN_TIMEOUT_US (50) +#define FLEXCAN_TIMEOUT_US (250) #define FLEXCAN_FDCTRL_FDRATE BIT(31) @@ -1271,6 +1271,7 @@ static int flexcan_chip_start(struct net_device *dev) reg_mecr = flexcan_read(priv, FLEXCAN_MECR); reg_mecr &= ~FLEXCAN_MECR_ECRWRDIS; flexcan_write(priv, FLEXCAN_MECR, reg_mecr); + reg_mecr |= FLEXCAN_MECR_ECCDIS; reg_mecr &= ~(FLEXCAN_MECR_NCEFAFRZ | FLEXCAN_MECR_HANCEI_MSK | FLEXCAN_MECR_FANCEI_MSK); flexcan_write(priv, FLEXCAN_MECR, reg_mecr); |