summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885/cimax2.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/cx23885/cimax2.c')
-rw-r--r--linux/drivers/media/video/cx23885/cimax2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx23885/cimax2.c b/linux/drivers/media/video/cx23885/cimax2.c
index 193d9b4cc..d717b9416 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;
@@ -320,7 +320,7 @@ static void netup_read_ci_status(struct work_struct *work)
"TS config = %02x\n", __func__, state->ci_i2c_addr, 0, buf[0],
buf[32]);
- if (buf[0] && 1)
+ if (buf[0] & 1)
state->status = DVB_CA_EN50221_POLL_CAM_PRESENT |
DVB_CA_EN50221_POLL_CAM_READY;
else
@@ -455,6 +455,7 @@ int netup_ci_init(struct cx23885_tsport *port)
#else
INIT_WORK(&state->work, netup_read_ci_status);
#endif
+ schedule_work(&state->work);
ci_dbg_print("%s: CI initialized!\n", __func__);