diff options
author | Andy Walls <awalls@radix.net> | 2009-02-16 00:23:25 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:01 -0400 |
commit | fa3e70360c86480acbaa54c9791e843196327a66 (patch) | |
tree | bc8d1f8b68f9aad107d63d6b6c9e884519fe1d34 /drivers/media/video/cx18/cx18-i2c.c | |
parent | 5811cf99df2e3c102055be3ea77508e56c9f77c6 (diff) |
V4L/DVB (10757): cx18, v4l2-chip-ident: Finish conversion of AV decoder core to v4l2_subdev
Added a new chip identifer to v4l2-chip-ident for the integrated A/V broadcast
decoder core internal to the CX23418. Completed separation and encapsulation
of the A/V decoder core interface as a v4l2_subdevice. The cx18 driver now
compiles and links again.
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-i2c.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c index db2c3e6997d0..db7b55281f50 100644 --- a/drivers/media/video/cx18/cx18-i2c.c +++ b/drivers/media/video/cx18/cx18-i2c.c | |||
@@ -304,7 +304,7 @@ int cx18_i2c_hw(struct cx18 *cx, u32 hw, unsigned int cmd, void *arg) | |||
304 | return cx18_gpio(cx, cmd, arg); | 304 | return cx18_gpio(cx, cmd, arg); |
305 | 305 | ||
306 | if (hw == CX18_HW_CX23418) | 306 | if (hw == CX18_HW_CX23418) |
307 | return cx18_av_cmd(cx, cmd, arg); | 307 | return v4l2_subdev_command(cx->sd_av, cmd, arg); |
308 | 308 | ||
309 | addr = cx18_i2c_hw_addr(cx, hw); | 309 | addr = cx18_i2c_hw_addr(cx, hw); |
310 | if (addr < 0) { | 310 | if (addr < 0) { |
@@ -322,7 +322,7 @@ void cx18_call_i2c_clients(struct cx18 *cx, unsigned int cmd, void *arg) | |||
322 | CX18_ERR("adapter is not set\n"); | 322 | CX18_ERR("adapter is not set\n"); |
323 | return; | 323 | return; |
324 | } | 324 | } |
325 | cx18_av_cmd(cx, cmd, arg); | 325 | v4l2_subdev_command(cx->sd_av, cmd, arg); |
326 | i2c_clients_command(&cx->i2c_adap[0], cmd, arg); | 326 | i2c_clients_command(&cx->i2c_adap[0], cmd, arg); |
327 | i2c_clients_command(&cx->i2c_adap[1], cmd, arg); | 327 | i2c_clients_command(&cx->i2c_adap[1], cmd, arg); |
328 | if (cx->hw_flags & CX18_HW_GPIO) | 328 | if (cx->hw_flags & CX18_HW_GPIO) |