diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-30 00:20:26 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-30 00:20:26 +0200 |
| commit | 6584af2799555f05b6545f667d94f780cbb24a1c (patch) | |
| tree | 5a28b4aa034ade289d316d9cbc9ef58120449394 /linux/drivers/media/video/cx18/cx18-driver.c | |
| parent | c7f462c7cd345d35a4d2e493c82f589c6e5d1d2d (diff) | |
| download | mediapointer-dvb-s2-6584af2799555f05b6545f667d94f780cbb24a1c.tar.gz mediapointer-dvb-s2-6584af2799555f05b6545f667d94f780cbb24a1c.tar.bz2 | |
v4l2-subdev: add load_fw and use that instead of abusing core->init.
From: Hans Verkuil <hverkuil@xs4all.nl>
The init callback was used in several places to load firmware. Make a separate
load_fw callback for that. This makes the code a lot more understandable.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c index f688ec7db..062129fb5 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.c +++ b/linux/drivers/media/video/cx18/cx18-driver.c @@ -815,7 +815,7 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev, CX18_ERR("Could not register A/V decoder subdevice\n"); goto free_map; } - cx18_call_hw(cx, CX18_HW_418_AV, core, init, (u32) CX18_AV_INIT_PLLS); + cx18_call_hw(cx, CX18_HW_418_AV, core, init, 0); /* Initialize GPIO Reset Controller to do chip resets during i2c init */ if (cx->card->hw_all & CX18_HW_GPIO_RESET_CTRL) { @@ -1033,7 +1033,7 @@ int cx18_init_on_first_open(struct cx18 *cx) cx18_vapi(cx, CX18_APU_STOP, 1, CX18_APU_ENCODING_METHOD_MPEG); /* Init the A/V decoder, if it hasn't been already */ - v4l2_subdev_call(cx->sd_av, core, init, (u32) CX18_AV_INIT_NORMAL); + v4l2_subdev_call(cx->sd_av, core, load_fw); vf.tuner = 0; vf.type = V4L2_TUNER_ANALOG_TV; |