diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-29 18:20:26 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:21 -0400 |
commit | cc26b076cf8b1040ccc514302ef9a24042272ec3 (patch) | |
tree | 6b41545a2d59f531cffd32d7161dcabc1d40d0e1 /drivers/media/video/ivtv/ivtv-driver.c | |
parent | 7c9fc9d50f97c9a6733ff1a22b6e31bcd91778e2 (diff) |
V4L/DVB (11369): v4l2-subdev: add load_fw and use that instead of abusing core->init.
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.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index eca8bf92a225..07d5ffea6e6f 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
@@ -1234,7 +1234,7 @@ int ivtv_init_on_first_open(struct ivtv *itv) | |||
1234 | if (itv->card->hw_all & IVTV_HW_CX25840) { | 1234 | if (itv->card->hw_all & IVTV_HW_CX25840) { |
1235 | struct v4l2_control ctrl; | 1235 | struct v4l2_control ctrl; |
1236 | 1236 | ||
1237 | v4l2_subdev_call(itv->sd_video, core, init, 0); | 1237 | v4l2_subdev_call(itv->sd_video, core, load_fw); |
1238 | /* CX25840_CID_ENABLE_PVR150_WORKAROUND */ | 1238 | /* CX25840_CID_ENABLE_PVR150_WORKAROUND */ |
1239 | ctrl.id = V4L2_CID_PRIVATE_BASE; | 1239 | ctrl.id = V4L2_CID_PRIVATE_BASE; |
1240 | ctrl.value = itv->pvr150_workaround; | 1240 | ctrl.value = itv->pvr150_workaround; |