Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -711,7 +711,6 @@ static int flexcan_chip_start(struct net_device *dev)
|
||||
{
|
||||
struct flexcan_priv *priv = netdev_priv(dev);
|
||||
struct flexcan_regs __iomem *regs = priv->base;
|
||||
unsigned int i;
|
||||
int err;
|
||||
u32 reg_mcr, reg_ctrl;
|
||||
|
||||
@@ -783,17 +782,6 @@ static int flexcan_chip_start(struct net_device *dev)
|
||||
netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
|
||||
flexcan_write(reg_ctrl, ®s->ctrl);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) {
|
||||
flexcan_write(0, ®s->cantxfg[i].can_ctrl);
|
||||
flexcan_write(0, ®s->cantxfg[i].can_id);
|
||||
flexcan_write(0, ®s->cantxfg[i].data[0]);
|
||||
flexcan_write(0, ®s->cantxfg[i].data[1]);
|
||||
|
||||
/* put MB into rx queue */
|
||||
flexcan_write(FLEXCAN_MB_CNT_CODE(0x4),
|
||||
®s->cantxfg[i].can_ctrl);
|
||||
}
|
||||
|
||||
/* Abort any pending TX, mark Mailbox as INACTIVE */
|
||||
flexcan_write(FLEXCAN_MB_CNT_CODE(0x4),
|
||||
®s->cantxfg[FLEXCAN_TX_BUF_ID].can_ctrl);
|
||||
|
||||
Reference in New Issue
Block a user