---

yaml --- r: 287487 b: refs/heads/master c: 44b0052 h: refs/heads/master i: 287485: c6e3f1d 287483: a684737 287479: 6eb1927 287471: 3ebbb00 287455: ba7811c 287423: 72452ef 287359: a5f9cfd 287231: f7cbedc v: v3
git-mirror · Feb 2, 2012 · e97d6bf · e97d6bf
1 parent 99573d6
commit e97d6bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3f240f460a36b158217944b52a85f304914c1a6
+refs/heads/master: 44b0052c5cb4e75389ed3eb9e98c29295a7dadfb
diff --git a/trunk/drivers/net/can/pch_can.c b/trunk/drivers/net/can/pch_can.c
@@ -66,6 +66,7 @@
 #define PCH_IF_CREQ_BUSY	BIT(15)
 
 #define PCH_STATUS_INT		0x8000
+#define PCH_RP			0x00008000
 #define PCH_REC			0x00007f00
 #define PCH_TEC			0x000000ff
 
@@ -527,7 +528,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
 		priv->can.can_stats.error_passive++;
 		state = CAN_STATE_ERROR_PASSIVE;
 		cf->can_id |= CAN_ERR_CRTL;
-		if (((errc & PCH_REC) >> 8) > 127)
+		if (errc & PCH_RP)
 			cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
 		if ((errc & PCH_TEC) > 127)
 			cf->data[1] |= CAN_ERR_CRTL_TX_PASSIVE;