From e97d6bf2a0fc08ba383e831dd3a0759f42bab126 Mon Sep 17 00:00:00 2001 From: Xi Wang Date: Mon, 12 Dec 2011 02:16:20 -0500 Subject: [PATCH] --- yaml --- r: 287487 b: refs/heads/master c: 44b0052c5cb4e75389ed3eb9e98c29295a7dadfb h: refs/heads/master i: 287485: c6e3f1d7e0eb00237cdc2f1aa908621c0f91ee3d 287483: a684737a6e1421161bbc66e59d85fa27d7f2ff9b 287479: 6eb1927b0c839ee97bdcb245bce4a09977e672ba 287471: 3ebbb0094dc9c6b4db511e763819b4a8b6de5075 287455: ba7811cd2f386b72b49ee497027193f1e115eb61 287423: 72452ef6510d134770dbe90e61cbc854145db25d 287359: a5f9cfd2669741d71841863a3fb70a86e6811403 287231: f7cbedc50c0c7729ace3863293236b3a11d7b3aa v: v3 --- [refs] | 2 +- trunk/drivers/net/can/pch_can.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 64d43e69c05d..e25b71774ac2 100644 --- 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 index d11fbb2b95ff..6edc25e0dd15 100644 --- 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;