aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-v4l2.c')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-v4l2.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index b12c2a7f1359..0caf70b8c0de 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -760,9 +760,9 @@ static int pvr2_v4l2_release(struct inode *inode, struct file *file)
760 hdw = fhp->channel.mc_head->hdw; 760 hdw = fhp->channel.mc_head->hdw;
761 pvr2_hdw_set_streaming(hdw,0); 761 pvr2_hdw_set_streaming(hdw,0);
762 sp = pvr2_ioread_get_stream(fhp->rhp); 762 sp = pvr2_ioread_get_stream(fhp->rhp);
763 if (sp) pvr2_stream_set_callback(sp,0,0); 763 if (sp) pvr2_stream_set_callback(sp,NULL,NULL);
764 pvr2_ioread_destroy(fhp->rhp); 764 pvr2_ioread_destroy(fhp->rhp);
765 fhp->rhp = 0; 765 fhp->rhp = NULL;
766 } 766 }
767 v4l2_prio_close(&vp->prio, &fhp->prio); 767 v4l2_prio_close(&vp->prio, &fhp->prio);
768 file->private_data = NULL; 768 file->private_data = NULL;
@@ -778,9 +778,9 @@ static int pvr2_v4l2_release(struct inode *inode, struct file *file)
778 } else { 778 } else {
779 vp->vfirst = fhp->vnext; 779 vp->vfirst = fhp->vnext;
780 } 780 }
781 fhp->vnext = 0; 781 fhp->vnext = NULL;
782 fhp->vprev = 0; 782 fhp->vprev = NULL;
783 fhp->vhead = 0; 783 fhp->vhead = NULL;
784 pvr2_channel_done(&fhp->channel); 784 pvr2_channel_done(&fhp->channel);
785 pvr2_trace(PVR2_TRACE_STRUCT, 785 pvr2_trace(PVR2_TRACE_STRUCT,
786 "Destroying pvr_v4l2_fh id=%p",fhp); 786 "Destroying pvr_v4l2_fh id=%p",fhp);
@@ -795,7 +795,7 @@ static int pvr2_v4l2_release(struct inode *inode, struct file *file)
795 795
796static int pvr2_v4l2_open(struct inode *inode, struct file *file) 796static int pvr2_v4l2_open(struct inode *inode, struct file *file)
797{ 797{
798 struct pvr2_v4l2_dev *dip = 0; /* Our own context pointer */ 798 struct pvr2_v4l2_dev *dip = NULL; /* Our own context pointer */
799 struct pvr2_v4l2_fh *fhp; 799 struct pvr2_v4l2_fh *fhp;
800 struct pvr2_v4l2 *vp; 800 struct pvr2_v4l2 *vp;
801 struct pvr2_hdw *hdw; 801 struct pvr2_hdw *hdw;
@@ -853,7 +853,7 @@ static int pvr2_v4l2_open(struct inode *inode, struct file *file)
853 pvr2_context_enter(vp->channel.mc_head); do { 853 pvr2_context_enter(vp->channel.mc_head); do {
854 pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr_v4l2_fh id=%p",fhp); 854 pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr_v4l2_fh id=%p",fhp);
855 pvr2_channel_init(&fhp->channel,vp->channel.mc_head); 855 pvr2_channel_init(&fhp->channel,vp->channel.mc_head);
856 fhp->vnext = 0; 856 fhp->vnext = NULL;
857 fhp->vprev = vp->vlast; 857 fhp->vprev = vp->vlast;
858 if (vp->vlast) { 858 if (vp->vlast) {
859 vp->vlast->vnext = fhp; 859 vp->vlast->vnext = fhp;
@@ -896,7 +896,7 @@ static int pvr2_v4l2_iosetup(struct pvr2_v4l2_fh *fh)
896 896
897 fh->rhp = pvr2_channel_create_mpeg_stream(fh->dev_info->stream); 897 fh->rhp = pvr2_channel_create_mpeg_stream(fh->dev_info->stream);
898 if (!fh->rhp) { 898 if (!fh->rhp) {
899 pvr2_channel_claim_stream(&fh->channel,0); 899 pvr2_channel_claim_stream(&fh->channel,NULL);
900 return -ENOMEM; 900 return -ENOMEM;
901 } 901 }
902 902