diff --git a/[refs] b/[refs]
index a74112de7e48..324c9bf5aebf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33a6f298c28a65fa643bc70222ebffe75077f197
+refs/heads/master: b156fd0483c8f18b3cc544d9c400fe454458e16a
diff --git a/trunk/drivers/net/can/at91_can.c b/trunk/drivers/net/can/at91_can.c
index 4fa0aa0e3f9c..ace9c087e75d 100644
--- a/trunk/drivers/net/can/at91_can.c
+++ b/trunk/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;