diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-18 12:21:25 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-18 12:21:25 -0300 |
commit | 6802e30de304059d908100b6874f246c45c47792 (patch) | |
tree | 357f49ba2ac92fe05facd95981bf51888e2afe8d /linux/drivers/media/video/cx23885 | |
parent | 53c5d79124323a6862c2ec0f3c73edba4f35eb89 (diff) | |
parent | 976a91082e499203f3700aa589a54aefedc3c22a (diff) | |
download | mediapointer-dvb-s2-6802e30de304059d908100b6874f246c45c47792.tar.gz mediapointer-dvb-s2-6802e30de304059d908100b6874f246c45c47792.tar.bz2 |
merge: http://linuxtv.org/hg/~awalls/cx18
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx23885')
-rw-r--r-- | linux/drivers/media/video/cx23885/cimax2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx23885/cimax2.c b/linux/drivers/media/video/cx23885/cimax2.c index 193d9b4cc..0e29f97f3 100644 --- a/linux/drivers/media/video/cx23885/cimax2.c +++ b/linux/drivers/media/video/cx23885/cimax2.c @@ -157,7 +157,7 @@ int netup_ci_get_mem(struct cx23885_dev *dev) } int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, - u8 flag, u8 read, u8 addr, u8 data) + u8 flag, u8 read, int addr, u8 data) { struct netup_ci_state *state = en50221->data; struct cx23885_tsport *port = state->priv; |