diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 1311891e7ee3..2d5be5cfbccf 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
@@ -492,7 +492,7 @@ static int ctrl_cx2341x_get(struct pvr2_ctrl *cptr,int *vp) | |||
492 | cs.controls = &c1; | 492 | cs.controls = &c1; |
493 | cs.count = 1; | 493 | cs.count = 1; |
494 | c1.id = cptr->info->v4l_id; | 494 | c1.id = cptr->info->v4l_id; |
495 | ret = cx2341x_ext_ctrls(&cptr->hdw->enc_ctl_state,&cs, | 495 | ret = cx2341x_ext_ctrls(&cptr->hdw->enc_ctl_state, 0, &cs, |
496 | VIDIOC_G_EXT_CTRLS); | 496 | VIDIOC_G_EXT_CTRLS); |
497 | if (ret) return ret; | 497 | if (ret) return ret; |
498 | *vp = c1.value; | 498 | *vp = c1.value; |
@@ -510,7 +510,7 @@ static int ctrl_cx2341x_set(struct pvr2_ctrl *cptr,int m,int v) | |||
510 | cs.count = 1; | 510 | cs.count = 1; |
511 | c1.id = cptr->info->v4l_id; | 511 | c1.id = cptr->info->v4l_id; |
512 | c1.value = v; | 512 | c1.value = v; |
513 | ret = cx2341x_ext_ctrls(&cptr->hdw->enc_ctl_state,&cs, | 513 | ret = cx2341x_ext_ctrls(&cptr->hdw->enc_ctl_state, 0, &cs, |
514 | VIDIOC_S_EXT_CTRLS); | 514 | VIDIOC_S_EXT_CTRLS); |
515 | if (ret) return ret; | 515 | if (ret) return ret; |
516 | cptr->hdw->enc_stale = !0; | 516 | cptr->hdw->enc_stale = !0; |
@@ -2478,7 +2478,7 @@ static int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw) | |||
2478 | cs.count = 1; | 2478 | cs.count = 1; |
2479 | c1.id = V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ; | 2479 | c1.id = V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ; |
2480 | c1.value = hdw->srate_val; | 2480 | c1.value = hdw->srate_val; |
2481 | cx2341x_ext_ctrls(&hdw->enc_ctl_state,&cs,VIDIOC_S_EXT_CTRLS); | 2481 | cx2341x_ext_ctrls(&hdw->enc_ctl_state, 0, &cs,VIDIOC_S_EXT_CTRLS); |
2482 | } | 2482 | } |
2483 | 2483 | ||
2484 | /* Scan i2c core at this point - before we clear all the dirty | 2484 | /* Scan i2c core at this point - before we clear all the dirty |