diff options
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r-- | drivers/media/video/cx18/cx18-controls.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx18/cx18-fileops.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx18/cx18-ioctl.c | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/video/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c index 7fa589240ff2..4b4b46544d5a 100644 --- a/drivers/media/video/cx18/cx18-controls.c +++ b/drivers/media/video/cx18/cx18-controls.c | |||
@@ -263,7 +263,7 @@ int cx18_s_ext_ctrls(struct file *file, void *fh, struct v4l2_ext_controls *c) | |||
263 | int ret; | 263 | int ret; |
264 | struct v4l2_control ctrl; | 264 | struct v4l2_control ctrl; |
265 | 265 | ||
266 | ret = v4l2_prio_check(&cx->prio, &id->prio); | 266 | ret = v4l2_prio_check(&cx->prio, id->prio); |
267 | if (ret) | 267 | if (ret) |
268 | return ret; | 268 | return ret; |
269 | 269 | ||
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c index 863ce7758239..e12a15020cda 100644 --- a/drivers/media/video/cx18/cx18-fileops.c +++ b/drivers/media/video/cx18/cx18-fileops.c | |||
@@ -700,7 +700,7 @@ int cx18_v4l2_close(struct file *filp) | |||
700 | 700 | ||
701 | CX18_DEBUG_IOCTL("close() of %s\n", s->name); | 701 | CX18_DEBUG_IOCTL("close() of %s\n", s->name); |
702 | 702 | ||
703 | v4l2_prio_close(&cx->prio, &id->prio); | 703 | v4l2_prio_close(&cx->prio, id->prio); |
704 | 704 | ||
705 | /* Easy case first: this stream was never claimed by us */ | 705 | /* Easy case first: this stream was never claimed by us */ |
706 | if (s->id != id->open_id) { | 706 | if (s->id != id->open_id) { |
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c index 2e6addab3ed6..2530fc54daaf 100644 --- a/drivers/media/video/cx18/cx18-ioctl.c +++ b/drivers/media/video/cx18/cx18-ioctl.c | |||
@@ -277,7 +277,7 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh, | |||
277 | int ret; | 277 | int ret; |
278 | int w, h; | 278 | int w, h; |
279 | 279 | ||
280 | ret = v4l2_prio_check(&cx->prio, &id->prio); | 280 | ret = v4l2_prio_check(&cx->prio, id->prio); |
281 | if (ret) | 281 | if (ret) |
282 | return ret; | 282 | return ret; |
283 | 283 | ||
@@ -306,7 +306,7 @@ static int cx18_s_fmt_vbi_cap(struct file *file, void *fh, | |||
306 | struct cx18 *cx = id->cx; | 306 | struct cx18 *cx = id->cx; |
307 | int ret; | 307 | int ret; |
308 | 308 | ||
309 | ret = v4l2_prio_check(&cx->prio, &id->prio); | 309 | ret = v4l2_prio_check(&cx->prio, id->prio); |
310 | if (ret) | 310 | if (ret) |
311 | return ret; | 311 | return ret; |
312 | 312 | ||
@@ -341,7 +341,7 @@ static int cx18_s_fmt_sliced_vbi_cap(struct file *file, void *fh, | |||
341 | int ret; | 341 | int ret; |
342 | struct v4l2_sliced_vbi_format *vbifmt = &fmt->fmt.sliced; | 342 | struct v4l2_sliced_vbi_format *vbifmt = &fmt->fmt.sliced; |
343 | 343 | ||
344 | ret = v4l2_prio_check(&cx->prio, &id->prio); | 344 | ret = v4l2_prio_check(&cx->prio, id->prio); |
345 | if (ret) | 345 | if (ret) |
346 | return ret; | 346 | return ret; |
347 | 347 | ||
@@ -549,7 +549,7 @@ static int cx18_s_crop(struct file *file, void *fh, struct v4l2_crop *crop) | |||
549 | struct cx18 *cx = id->cx; | 549 | struct cx18 *cx = id->cx; |
550 | int ret; | 550 | int ret; |
551 | 551 | ||
552 | ret = v4l2_prio_check(&cx->prio, &id->prio); | 552 | ret = v4l2_prio_check(&cx->prio, id->prio); |
553 | if (ret) | 553 | if (ret) |
554 | return ret; | 554 | return ret; |
555 | 555 | ||
@@ -601,7 +601,7 @@ int cx18_s_input(struct file *file, void *fh, unsigned int inp) | |||
601 | struct cx18 *cx = id->cx; | 601 | struct cx18 *cx = id->cx; |
602 | int ret; | 602 | int ret; |
603 | 603 | ||
604 | ret = v4l2_prio_check(&cx->prio, &id->prio); | 604 | ret = v4l2_prio_check(&cx->prio, id->prio); |
605 | if (ret) | 605 | if (ret) |
606 | return ret; | 606 | return ret; |
607 | 607 | ||
@@ -647,7 +647,7 @@ int cx18_s_frequency(struct file *file, void *fh, struct v4l2_frequency *vf) | |||
647 | struct cx18 *cx = id->cx; | 647 | struct cx18 *cx = id->cx; |
648 | int ret; | 648 | int ret; |
649 | 649 | ||
650 | ret = v4l2_prio_check(&cx->prio, &id->prio); | 650 | ret = v4l2_prio_check(&cx->prio, id->prio); |
651 | if (ret) | 651 | if (ret) |
652 | return ret; | 652 | return ret; |
653 | 653 | ||
@@ -675,7 +675,7 @@ int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std) | |||
675 | struct cx18 *cx = id->cx; | 675 | struct cx18 *cx = id->cx; |
676 | int ret; | 676 | int ret; |
677 | 677 | ||
678 | ret = v4l2_prio_check(&cx->prio, &id->prio); | 678 | ret = v4l2_prio_check(&cx->prio, id->prio); |
679 | if (ret) | 679 | if (ret) |
680 | return ret; | 680 | return ret; |
681 | 681 | ||
@@ -715,7 +715,7 @@ static int cx18_s_tuner(struct file *file, void *fh, struct v4l2_tuner *vt) | |||
715 | struct cx18 *cx = id->cx; | 715 | struct cx18 *cx = id->cx; |
716 | int ret; | 716 | int ret; |
717 | 717 | ||
718 | ret = v4l2_prio_check(&cx->prio, &id->prio); | 718 | ret = v4l2_prio_check(&cx->prio, id->prio); |
719 | if (ret) | 719 | if (ret) |
720 | return ret; | 720 | return ret; |
721 | 721 | ||