Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59fa5348 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fixes-for-3.8' of git://gitorious.org/linux-can/linux-can 



Marc Kleine-Budde says:

====================
here's a patch for net for the v3.8 release cycle. Alexander Stein noticed that
the c_can hardware has a fixed bit in the IFx_MASK2 register. His patch fixes
writing of this register by always setting this bit.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 559bcac3 2bd3bc4e

drivers/net/can/c_can/c_can.c

+5 −1
Original line number Diff line number Diff line
@@ -488,8 +488,12 @@ static void c_can_setup_receive_object(struct net_device *dev, int iface, 


	priv->write_reg(priv, C_CAN_IFACE(MASK1_REG, iface),

			IFX_WRITE_LOW_16BIT(mask));



	/* According to C_CAN documentation, the reserved bit

	 * in IFx_MASK2 register is fixed 1

	 */

	priv->write_reg(priv, C_CAN_IFACE(MASK2_REG, iface),

			IFX_WRITE_HIGH_16BIT(mask));

			IFX_WRITE_HIGH_16BIT(mask) | BIT(13));



	priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface),

			IFX_WRITE_LOW_16BIT(id));