diff options
Diffstat (limited to 'drivers/staging/media/cxd2099/cxd2099.c')
-rw-r--r-- | drivers/staging/media/cxd2099/cxd2099.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/staging/media/cxd2099/cxd2099.c b/drivers/staging/media/cxd2099/cxd2099.c index 6cb74dacc69d..a2a5182570c5 100644 --- a/drivers/staging/media/cxd2099/cxd2099.c +++ b/drivers/staging/media/cxd2099/cxd2099.c @@ -329,11 +329,14 @@ static int init(struct cxd *ci) break; #if 0 - status = write_reg(ci, 0x09, 0x4D); /* Input Mode C, BYPass Serial, TIVAL = low, MSB */ + /* Input Mode C, BYPass Serial, TIVAL = low, MSB */ + status = write_reg(ci, 0x09, 0x4D); if (status < 0) break; #endif - status = write_reg(ci, 0x0A, 0xA7); /* TOSTRT = 8, Mode B (gated clock), falling Edge, Serial, POL=HIGH, MSB */ + /* TOSTRT = 8, Mode B (gated clock), falling Edge, + * Serial, POL=HIGH, MSB */ + status = write_reg(ci, 0x0A, 0xA7); if (status < 0) break; @@ -589,7 +592,7 @@ static int campoll(struct cxd *ci) read_reg(ci, 0x01, &slotstat); if (!(2&slotstat)) { if (!ci->slot_stat) { - ci->slot_stat |= DVB_CA_EN50221_POLL_CAM_PRESENT; + ci->slot_stat = DVB_CA_EN50221_POLL_CAM_PRESENT; write_regm(ci, 0x03, 0x08, 0x08); } @@ -601,7 +604,8 @@ static int campoll(struct cxd *ci) ci->ready = 0; } } - if (istat&8 && ci->slot_stat == DVB_CA_EN50221_POLL_CAM_PRESENT) { + if (istat&8 && + ci->slot_stat == DVB_CA_EN50221_POLL_CAM_PRESENT) { ci->ready = 1; ci->slot_stat |= DVB_CA_EN50221_POLL_CAM_READY; } |