diff options
| author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2017-11-24 12:43:21 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-11-29 15:03:43 +0100 |
| commit | a9e9e4234b68eb45fd5f4cf01b16df35afbd505e (patch) | |
| tree | a14b0b3b9352152b61420b7f77b68d04c89a4359 /drivers/net/can/apalis-tk1-k20-can.c | |
| parent | 09418f875a5b1d4a1f0a7dfb0d36d0ae90de1b20 (diff) | |
mfd: apalis-tk1: 0.11 fw support
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'drivers/net/can/apalis-tk1-k20-can.c')
| -rw-r--r-- | drivers/net/can/apalis-tk1-k20-can.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/apalis-tk1-k20-can.c b/drivers/net/can/apalis-tk1-k20-can.c index 1df9fae96cc3..22437c48296f 100644 --- a/drivers/net/can/apalis-tk1-k20-can.c +++ b/drivers/net/can/apalis-tk1-k20-can.c @@ -148,7 +148,7 @@ static void apalis_tk1_k20_can_hw_rx_frame(struct net_device *net, u8 *buf, apalis_tk1_k20_lock(priv->apalis_tk1_k20); apalis_tk1_k20_reg_read_bulk(priv->apalis_tk1_k20, - APALIS_TK1_K20_CAN_OUT_BUF + APALIS_TK1_K20_CAN_IN_BUF + APALIS_TK1_K20_CAN_DEV_OFFSET( priv->pdata->id), buf, CAN_TRANSFER_BUF_LEN); @@ -177,7 +177,7 @@ static void apalis_tk1_k20_can_hw_rx(struct net_device *net, int buf_idx) struct apalis_tk1_k20_priv *priv = netdev_priv(net); struct sk_buff *skb; struct can_frame *frame; - u32 available_frames = 0; + u8 available_frames = 0; u8 buf[CAN_TRANSFER_BUF_LEN]; skb = alloc_can_skb(priv->net, &frame); |