diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-10-21 01:01:19 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-24 14:47:50 -0700 |
| commit | b156fd0483c8f18b3cc544d9c400fe454458e16a (patch) | |
| tree | de574e22143f8622bbbe7b4c48aca978cf4ad7c1 /drivers/net/can/at91_can.c | |
| parent | 33a6f298c28a65fa643bc70222ebffe75077f197 (diff) | |
| download | blackbird-op-linux-b156fd0483c8f18b3cc544d9c400fe454458e16a.tar.gz blackbird-op-linux-b156fd0483c8f18b3cc544d9c400fe454458e16a.zip | |
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/can/at91_can.c')
| -rw-r--r-- | drivers/net/can/at91_can.c | 2 |
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) reg_mr = at91_read(priv, AT91_MR); at91_write(priv, AT91_MR, reg_mr & ~AT91_MR_CANEN); + at91_set_bittiming(dev); at91_setup_mailboxes(dev); at91_transceiver_switch(priv, 1); @@ -1086,7 +1087,6 @@ static int __devinit at91_can_probe(struct platform_device *pdev) priv = netdev_priv(dev); priv->can.clock.freq = clk_get_rate(clk); priv->can.bittiming_const = &at91_bittiming_const; - priv->can.do_set_bittiming = at91_set_bittiming; priv->can.do_set_mode = at91_set_mode; priv->can.do_get_berr_counter = at91_get_berr_counter; priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES; |
