]> rtime.felk.cvut.cz Git - socketcan-devel.git/commitdiff
revert code movement from previous commit.
authorhartkopp <hartkopp@030b6a49-0b11-0410-94ab-b0dab22257f2>
Mon, 31 Aug 2009 14:41:15 +0000 (14:41 +0000)
committerhartkopp <hartkopp@030b6a49-0b11-0410-94ab-b0dab22257f2>
Mon, 31 Aug 2009 14:41:15 +0000 (14:41 +0000)
git-svn-id: svn://svn.berlios.de//socketcan/trunk@1047 030b6a49-0b11-0410-94ab-b0dab22257f2

kernel/2.6/drivers/net/can/dev.c

index 8306edf595addfd902bf228535ff62e78eec9d54..99dae65eaf36ad43c58ee4d8201ee3506f03fa84 100644 (file)
@@ -152,9 +152,7 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)
                }
        }
 
-       /* real sample point */
-       bt->sample_point = can_update_spt(btc, sampl_pt, best_tseg,
-                                         &tseg1, &tseg2);
+       spt = can_update_spt(btc, sampl_pt, best_tseg, &tseg1, &tseg2);
 
        v64 = (u64)best_brp * 1000000000UL;
        do_div(v64, priv->clock.freq);
@@ -167,6 +165,8 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)
 #ifndef CONFIG_CAN_DEV_SYSFS
        /* real bit-rate */
        bt->bitrate = priv->clock.freq / (bt->brp * (tseg1 + tseg2 + 1));
+       /* real sample point */
+       bt->sample_point = spt;
 #endif
        return 0;
 }