From: Marc Kleine-Budde Date: Thu, 21 Oct 2010 01:01:13 +0000 (+0000) Subject: can: at91_can: use correct bit to enable CAN_CTRLMODE_3_SAMPLES X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dbe91325c2d6ad34c1ce4f2aeae4bbd11b7a3fff;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git can: at91_can: use correct bit to enable CAN_CTRLMODE_3_SAMPLES Signed-off-by: Marc Kleine-Budde Signed-off-by: David S. Miller --- diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c index 2d8bd86bc5e2..b2a4599eb1d7 100644 --- a/drivers/net/can/at91_can.c +++ b/drivers/net/can/at91_can.c @@ -2,7 +2,7 @@ * at91_can.c - CAN network driver for AT91 SoC CAN controller * * (C) 2007 by Hans J. Koch - * (C) 2008, 2009 by Marc Kleine-Budde + * (C) 2008, 2009, 2010 by Marc Kleine-Budde * * This software may be distributed under the terms of the GNU General * Public License ("GPL") version 2 as distributed in the 'COPYING' @@ -257,8 +257,8 @@ static int at91_set_bittiming(struct net_device *dev) const struct can_bittiming *bt = &priv->can.bittiming; u32 reg_br; - reg_br = ((priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) << 24) | - ((bt->brp - 1) << 16) | ((bt->sjw - 1) << 12) | + reg_br = ((priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) ? 1 << 24 : 0) | + ((bt->brp - 1) << 16) | ((bt->sjw - 1) << 12) | ((bt->prop_seg - 1) << 8) | ((bt->phase_seg1 - 1) << 4) | ((bt->phase_seg2 - 1) << 0);