diff options
| -rw-r--r-- | drivers/staging/i4l/act2000/capi.c | 3 | ||||
| -rw-r--r-- | drivers/staging/i4l/act2000/capi.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/i4l/act2000/capi.c b/drivers/staging/i4l/act2000/capi.c index 3f66ca20b5e5..41b4d191c215 100644 --- a/drivers/staging/i4l/act2000/capi.c +++ b/drivers/staging/i4l/act2000/capi.c @@ -547,12 +547,11 @@ static int actcapi_data_b3_ind(act2000_card *card, struct sk_buff *skb) { __u16 plci; __u16 ncci; - __u16 controller; __u8 blocknr; int chan; actcapi_msg *msg = (actcapi_msg *)skb->data; - EVAL_NCCI(msg->msg.data_b3_ind.fakencci, plci, controller, ncci); + EVAL_NCCI(msg->msg.data_b3_ind.fakencci, plci, ncci); chan = find_ncci(card, ncci); if (chan < 0) return 0; diff --git a/drivers/staging/i4l/act2000/capi.h b/drivers/staging/i4l/act2000/capi.h index 01ccdecd43f7..7d0f52db7fa5 100644 --- a/drivers/staging/i4l/act2000/capi.h +++ b/drivers/staging/i4l/act2000/capi.h @@ -114,9 +114,8 @@ typedef struct actcapi_ncpd { #define MAKE_NCCI(plci, contr, ncci) \ ((plci & 0x1f) | ((contr & 0x7) << 5) | ((ncci & 0xff) << 8)) -#define EVAL_NCCI(fakencci, plci, contr, ncci) { \ +#define EVAL_NCCI(fakencci, plci, ncci) { \ plci = fakencci & 0x1f; \ - contr = (fakencci >> 5) & 0x7; \ ncci = (fakencci >> 8) & 0xff; \ } |
