diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-01 07:36:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-01 07:36:31 -0300 |
| commit | e149dc20dba1c192f28fbeab92aac7f004a41273 (patch) | |
| tree | 18aaa82ffabd3790e47ef35e2f631932ef5c46e8 /linux/drivers/media/video/saa7134/saa7134-empress.c | |
| parent | fdab553be22b01acd8124650ed75da649169596f (diff) | |
| parent | e8b1f94e600957e27366e37a729126388c705c7d (diff) | |
| download | mediapointer-dvb-s2-e149dc20dba1c192f28fbeab92aac7f004a41273.tar.gz mediapointer-dvb-s2-e149dc20dba1c192f28fbeab92aac7f004a41273.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-empress.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index 609342128..bab6b56c8 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/drivers/media/video/saa7134/saa7134-empress.c @@ -416,8 +416,7 @@ static int empress_g_chip_ident(struct file *file, void *fh, if (chip->match.type == V4L2_CHIP_MATCH_I2C_DRIVER && !strcmp(chip->match.name, "saa6752hs")) return saa_call_empress(dev, core, g_chip_ident, chip); - if (chip->match.type == V4L2_CHIP_MATCH_I2C_ADDR && - chip->match.addr == 0x20) + if (chip->match.type == V4L2_CHIP_MATCH_I2C_ADDR) return saa_call_empress(dev, core, g_chip_ident, chip); return -EINVAL; } |