浏览代码

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>
Abhilash K V 14 年之前
父节点
当前提交
6f288cc52f
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/net/can/ti_hecc.c

+ 1 - 1
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);
 	spin_unlock_irqrestore(&priv->mbx_lock, flags);
 
 
 	/* Prepare mailbox for transmission */
 	/* Prepare mailbox for transmission */
+	data = cf->can_dlc | (get_tx_head_prio(priv) << 8);
 	if (cf->can_id & CAN_RTR_FLAG) /* Remote transmission request */
 	if (cf->can_id & CAN_RTR_FLAG) /* Remote transmission request */
 		data |= HECC_CANMCF_RTR;
 		data |= HECC_CANMCF_RTR;
-	data |= get_tx_head_prio(priv) << 8;
 	hecc_write_mbx(priv, mbxno, HECC_CANMCF, data);
 	hecc_write_mbx(priv, mbxno, HECC_CANMCF, data);
 
 
 	if (cf->can_id & CAN_EFF_FLAG) /* Extended frame format */
 	if (cf->can_id & CAN_EFF_FLAG) /* Extended frame format */