]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
can: ti_hecc: Fix unintialized variable
authorAbhilash K V <abhilash.kv@ti.com>
Tue, 23 Aug 2011 03:05:48 +0000 (03:05 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Aug 2011 16:48:24 +0000 (12:48 -0400)
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>
drivers/net/can/ti_hecc.c

index f7bbde9eb2cba34db7c27207648fc000320dc690..0b19a17d81783218ff9bba3f1e5a1853b0430c58 100644 (file)
@@ -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 */