diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-04-22 04:06:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-26 15:51:29 -0300 |
| commit | 3e1fd4783b2b4ae887112e6af3ce1bb1a6be19c4 (patch) | |
| tree | 2ed8a7c01e0b13464d064eaca91d822e57d543a1 /drivers | |
| parent | 5694e0298fccea44648a35aab64359c5105b0afc (diff) | |
| download | linux-stable-3e1fd4783b2b4ae887112e6af3ce1bb1a6be19c4.tar.gz linux-stable-3e1fd4783b2b4ae887112e6af3ce1bb1a6be19c4.tar.bz2 linux-stable-3e1fd4783b2b4ae887112e6af3ce1bb1a6be19c4.zip | |
[media] fintek-cir: change || to &&
The current condition is always true, so everything uses
LOGICAL_DEV_CIR_REV2 (8). It should be that Fintek products
0x0408(F71809) and 0x0804(F71855) use logical device
LOGICAL_DEV_CIR_REV1 (5) and other chip ids use logical device 8.
In other words, this fixes hardware detection for 0x0408 and 0x0804.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/rc/fintek-cir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c index 238d4033a826..4a3a238bcfbc 100644 --- a/drivers/media/rc/fintek-cir.c +++ b/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; |