diff options
Diffstat (limited to 'drivers/media/video/cx18/cx18-fileops.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-fileops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c index 425271a29517..055f6e004b2d 100644 --- a/drivers/media/video/cx18/cx18-fileops.c +++ b/drivers/media/video/cx18/cx18-fileops.c | |||
@@ -552,7 +552,7 @@ void cx18_stop_capture(struct cx18_open_id *id, int gop_end) | |||
552 | } | 552 | } |
553 | } | 553 | } |
554 | 554 | ||
555 | int cx18_v4l2_close(struct inode *inode, struct file *filp) | 555 | int cx18_v4l2_close(struct file *filp) |
556 | { | 556 | { |
557 | struct cx18_open_id *id = filp->private_data; | 557 | struct cx18_open_id *id = filp->private_data; |
558 | struct cx18 *cx = id->cx; | 558 | struct cx18 *cx = id->cx; |
@@ -650,12 +650,12 @@ static int cx18_serialized_open(struct cx18_stream *s, struct file *filp) | |||
650 | return 0; | 650 | return 0; |
651 | } | 651 | } |
652 | 652 | ||
653 | int cx18_v4l2_open(struct inode *inode, struct file *filp) | 653 | int cx18_v4l2_open(struct file *filp) |
654 | { | 654 | { |
655 | int res, x, y = 0; | 655 | int res, x, y = 0; |
656 | struct cx18 *cx = NULL; | 656 | struct cx18 *cx = NULL; |
657 | struct cx18_stream *s = NULL; | 657 | struct cx18_stream *s = NULL; |
658 | int minor = iminor(inode); | 658 | int minor = video_devdata(filp)->minor; |
659 | 659 | ||
660 | /* Find which card this open was on */ | 660 | /* Find which card this open was on */ |
661 | spin_lock(&cx18_cards_lock); | 661 | spin_lock(&cx18_cards_lock); |