From af46aca1bd764f5568e61c91c6cef2d9fcba8eb5 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sun, 22 Apr 2012 04:06:17 -0300 Subject: [PATCH] --- yaml --- r: 300247 b: refs/heads/master c: 3e1fd4783b2b4ae887112e6af3ce1bb1a6be19c4 h: refs/heads/master i: 300245: 268c985b4ab65d7fbce5f4b3c0380db8366ef3de 300243: 9aac4273a7ccad9ec601d90b676b66f7fed7fa03 300239: ee3c482b04437ac754d1a393dbabd906f297f732 v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/fintek-cir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bac89d02ee40..9ab778e3bced 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5694e0298fccea44648a35aab64359c5105b0afc +refs/heads/master: 3e1fd4783b2b4ae887112e6af3ce1bb1a6be19c4 diff --git a/trunk/drivers/media/rc/fintek-cir.c b/trunk/drivers/media/rc/fintek-cir.c index 238d4033a826..4a3a238bcfbc 100644 --- a/trunk/drivers/media/rc/fintek-cir.c +++ b/trunk/drivers/media/rc/fintek-cir.c @@ -197,7 +197,7 @@ static int fintek_hw_detect(struct fintek_dev *fintek) /* * Newer reviews of this chipset uses port 8 instead of 5 */ - if ((chip != 0x0408) || (chip != 0x0804)) + if ((chip != 0x0408) && (chip != 0x0804)) fintek->logical_dev_cir = LOGICAL_DEV_CIR_REV2; else fintek->logical_dev_cir = LOGICAL_DEV_CIR_REV1;