aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-10-20 21:01:19 -0400
committerDavid S. Miller <davem@davemloft.net>2010-10-24 17:47:50 -0400
commitb156fd0483c8f18b3cc544d9c400fe454458e16a (patch)
treede574e22143f8622bbbe7b4c48aca978cf4ad7c1 /drivers/net
parent33a6f298c28a65fa643bc70222ebffe75077f197 (diff)
can: at91_can: set bittiming in chip_start
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/at91_can.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 4fa0aa0e3f9c..ace9c087e75d 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -299,6 +299,7 @@ static void at91_chip_start(struct net_device *dev)
299 reg_mr = at91_read(priv, AT91_MR); 299 reg_mr = at91_read(priv, AT91_MR);
300 at91_write(priv, AT91_MR, reg_mr & ~AT91_MR_CANEN); 300 at91_write(priv, AT91_MR, reg_mr & ~AT91_MR_CANEN);
301 301
302 at91_set_bittiming(dev);
302 at91_setup_mailboxes(dev); 303 at91_setup_mailboxes(dev);
303 at91_transceiver_switch(priv, 1); 304 at91_transceiver_switch(priv, 1);
304 305
@@ -1086,7 +1087,6 @@ static int __devinit at91_can_probe(struct platform_device *pdev)
1086 priv = netdev_priv(dev); 1087 priv = netdev_priv(dev);
1087 priv->can.clock.freq = clk_get_rate(clk); 1088 priv->can.clock.freq = clk_get_rate(clk);
1088 priv->can.bittiming_const = &at91_bittiming_const; 1089 priv->can.bittiming_const = &at91_bittiming_const;
1089 priv->can.do_set_bittiming = at91_set_bittiming;
1090 priv->can.do_set_mode = at91_set_mode; 1090 priv->can.do_set_mode = at91_set_mode;
1091 priv->can.do_get_berr_counter = at91_get_berr_counter; 1091 priv->can.do_get_berr_counter = at91_get_berr_counter;
1092 priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES; 1092 priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;