diff options
| author | Abhilash K V <abhilash.kv@ti.com> | 2011-08-23 03:05:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-26 12:48:24 -0400 |
| commit | 6f288cc52f478e6f58d96158e7cd857fedb6d111 (patch) | |
| tree | b4d145d3b0de634f502f50f89febe193a1f93dee /drivers/net/can | |
| parent | 69558eeeaba7d79364bb9ac4743dc1ad209508b7 (diff) | |
| download | linux-3.10-6f288cc52f478e6f58d96158e7cd857fedb6d111.tar.gz linux-3.10-6f288cc52f478e6f58d96158e7cd857fedb6d111.tar.bz2 linux-3.10-6f288cc52f478e6f58d96158e7cd857fedb6d111.zip | |
can: ti_hecc: Fix unintialized variable
In ti_hecc_xmit(), local variable "data" is not initialized before
being used.
This initialization got inadvertently removed in the following patch:
can: Unify droping of invalid tx skbs and netdev stats
Acked-by: Anant Gole <anantgole@ti.com>
Signed-off-by: Abhilash K V <abhilash.kv@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/ti_hecc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c index f7bbde9eb2c..0b19a17d817 100644 --- a/drivers/net/can/ti_hecc.c +++ b/drivers/net/can/ti_hecc.c @@ -503,9 +503,9 @@ static netdev_tx_t ti_hecc_xmit(struct sk_buff *skb, struct net_device *ndev) spin_unlock_irqrestore(&priv->mbx_lock, flags); /* Prepare mailbox for transmission */ + data = cf->can_dlc | (get_tx_head_prio(priv) << 8); if (cf->can_id & CAN_RTR_FLAG) /* Remote transmission request */ data |= HECC_CANMCF_RTR; - data |= get_tx_head_prio(priv) << 8; hecc_write_mbx(priv, mbxno, HECC_CANMCF, data); if (cf->can_id & CAN_EFF_FLAG) /* Extended frame format */ |