diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-24 09:05:23 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-24 09:05:23 -0200 |
commit | c1ad9834d2d8678d26d3ce2a6cf39038345c33f7 (patch) | |
tree | 4f0ef2cd6728a226c78d62abf7c463ffd3a3d403 /linux/drivers/media/video/upd64083.c | |
parent | 9047bbc89eed91f91b8e0e7b3341bf696515889a (diff) | |
parent | 0c10299d80fe45160d3c79fd58634ae3b1c025db (diff) | |
download | mediapointer-dvb-s2-c1ad9834d2d8678d26d3ce2a6cf39038345c33f7.tar.gz mediapointer-dvb-s2-c1ad9834d2d8678d26d3ce2a6cf39038345c33f7.tar.bz2 |
merge: http://linuxtv.org/hg/~hhackmann/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/upd64083.c')
-rw-r--r-- | linux/drivers/media/video/upd64083.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/upd64083.c b/linux/drivers/media/video/upd64083.c index 61be85abd..317baed46 100644 --- a/linux/drivers/media/video/upd64083.c +++ b/linux/drivers/media/video/upd64083.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "compat.h" #include <linux/version.h> #include <linux/module.h> #include <linux/kernel.h> @@ -28,6 +27,7 @@ #include <linux/videodev2.h> #include <media/v4l2-common.h> #include <media/upd64083.h> +#include "compat.h" MODULE_DESCRIPTION("uPD64083 driver"); MODULE_AUTHOR("T. Adachi, Takeru KOMORIYA, Hans Verkuil"); @@ -152,7 +152,7 @@ static int upd64083_command(struct i2c_client *client, unsigned int cmd, void *a { struct v4l2_register *reg = arg; - if (reg->i2c_id != I2C_DRIVERID_UPD64083) + if (!v4l2_chip_match_i2c_client(client, reg->match_type, reg->match_chip)) return -EINVAL; if (!capable(CAP_SYS_ADMIN)) return -EPERM; |