Merge branch 'fixes-for-3.12' of git://gitorious.org/linux-can/linux-can
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
d9a71f97d5
|
@ -702,7 +702,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;
|
||||
|
||||
|
@ -772,17 +771,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);
|
||||
}
|
||||
|
||||
/* acceptance mask/acceptance code (accept everything) */
|
||||
flexcan_write(0x0, ®s->rxgmask);
|
||||
flexcan_write(0x0, ®s->rx14mask);
|
||||
|
|
Loading…
Reference in a new issue