diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-sysfs.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c index c6e6523d74b4..6af55a8b6f05 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c +++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c | |||
@@ -504,7 +504,7 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id) | |||
504 | cip->cptr = cptr; | 504 | cip->cptr = cptr; |
505 | 505 | ||
506 | cip->chptr = sfp; | 506 | cip->chptr = sfp; |
507 | cip->item_next = 0; | 507 | cip->item_next = NULL; |
508 | if (sfp->item_last) { | 508 | if (sfp->item_last) { |
509 | sfp->item_last->item_next = cip; | 509 | sfp->item_last->item_next = cip; |
510 | } else { | 510 | } else { |
@@ -625,7 +625,7 @@ static void pvr2_sysfs_tear_down_debugifc(struct pvr2_sysfs *sfp) | |||
625 | &sfp->debugifc->attr_debuginfo); | 625 | &sfp->debugifc->attr_debuginfo); |
626 | class_device_remove_file(sfp->class_dev,&sfp->debugifc->attr_debugcmd); | 626 | class_device_remove_file(sfp->class_dev,&sfp->debugifc->attr_debugcmd); |
627 | kfree(sfp->debugifc); | 627 | kfree(sfp->debugifc); |
628 | sfp->debugifc = 0; | 628 | sfp->debugifc = NULL; |
629 | } | 629 | } |
630 | #endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */ | 630 | #endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */ |
631 | 631 | ||
@@ -678,9 +678,9 @@ static void class_dev_destroy(struct pvr2_sysfs *sfp) | |||
678 | class_device_remove_file(sfp->class_dev,&sfp->attr_v4l_minor_number); | 678 | class_device_remove_file(sfp->class_dev,&sfp->attr_v4l_minor_number); |
679 | class_device_remove_file(sfp->class_dev,&sfp->attr_unit_number); | 679 | class_device_remove_file(sfp->class_dev,&sfp->attr_unit_number); |
680 | pvr2_sysfs_trace("Destroying class_dev id=%p",sfp->class_dev); | 680 | pvr2_sysfs_trace("Destroying class_dev id=%p",sfp->class_dev); |
681 | sfp->class_dev->class_data = 0; | 681 | sfp->class_dev->class_data = NULL; |
682 | class_device_unregister(sfp->class_dev); | 682 | class_device_unregister(sfp->class_dev); |
683 | sfp->class_dev = 0; | 683 | sfp->class_dev = NULL; |
684 | } | 684 | } |
685 | 685 | ||
686 | 686 | ||
@@ -739,13 +739,13 @@ static void class_dev_create(struct pvr2_sysfs *sfp, | |||
739 | sfp->attr_v4l_minor_number.attr.name = "v4l_minor_number"; | 739 | sfp->attr_v4l_minor_number.attr.name = "v4l_minor_number"; |
740 | sfp->attr_v4l_minor_number.attr.mode = S_IRUGO; | 740 | sfp->attr_v4l_minor_number.attr.mode = S_IRUGO; |
741 | sfp->attr_v4l_minor_number.show = v4l_minor_number_show; | 741 | sfp->attr_v4l_minor_number.show = v4l_minor_number_show; |
742 | sfp->attr_v4l_minor_number.store = 0; | 742 | sfp->attr_v4l_minor_number.store = NULL; |
743 | class_device_create_file(sfp->class_dev,&sfp->attr_v4l_minor_number); | 743 | class_device_create_file(sfp->class_dev,&sfp->attr_v4l_minor_number); |
744 | sfp->attr_unit_number.attr.owner = THIS_MODULE; | 744 | sfp->attr_unit_number.attr.owner = THIS_MODULE; |
745 | sfp->attr_unit_number.attr.name = "unit_number"; | 745 | sfp->attr_unit_number.attr.name = "unit_number"; |
746 | sfp->attr_unit_number.attr.mode = S_IRUGO; | 746 | sfp->attr_unit_number.attr.mode = S_IRUGO; |
747 | sfp->attr_unit_number.show = unit_number_show; | 747 | sfp->attr_unit_number.show = unit_number_show; |
748 | sfp->attr_unit_number.store = 0; | 748 | sfp->attr_unit_number.store = NULL; |
749 | class_device_create_file(sfp->class_dev,&sfp->attr_unit_number); | 749 | class_device_create_file(sfp->class_dev,&sfp->attr_unit_number); |
750 | 750 | ||
751 | pvr2_sysfs_add_controls(sfp); | 751 | pvr2_sysfs_add_controls(sfp); |
@@ -806,7 +806,7 @@ struct pvr2_sysfs_class *pvr2_sysfs_class_create(void) | |||
806 | pvr2_sysfs_trace( | 806 | pvr2_sysfs_trace( |
807 | "Registration failed for pvr2_sysfs_class id=%p",clp); | 807 | "Registration failed for pvr2_sysfs_class id=%p",clp); |
808 | kfree(clp); | 808 | kfree(clp); |
809 | clp = 0; | 809 | clp = NULL; |
810 | } | 810 | } |
811 | return clp; | 811 | return clp; |
812 | } | 812 | } |