diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2011-03-05 17:55:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 16:52:56 -0500 |
commit | cb81fa07f8beaead14ce500a0e43171591a03ea7 (patch) | |
tree | b954ceac507c1a87a38af45d9b22f3590666e12b /drivers/staging/easycap | |
parent | c0b3a8a034c225727a810977aee0ccd72b2d92c9 (diff) |
staging/easycap: kill EASYCAP_IS_VIDEODEV_CLIENT compilation conditional
remove EASYCAP_IS_VIDEODEV_CLIENT and irrelevant code as the define
is always set in the in-kernel driver
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap')
-rw-r--r-- | drivers/staging/easycap/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/easycap/easycap.h | 10 | ||||
-rw-r--r-- | drivers/staging/easycap/easycap_main.c | 93 | ||||
-rw-r--r-- | drivers/staging/easycap/easycap_sound_oss.c | 8 |
4 files changed, 1 insertions, 111 deletions
diff --git a/drivers/staging/easycap/Makefile b/drivers/staging/easycap/Makefile index 1f9331ba488..b13e9ac473b 100644 --- a/drivers/staging/easycap/Makefile +++ b/drivers/staging/easycap/Makefile | |||
@@ -9,5 +9,4 @@ easycap-$(CONFIG_EASYCAP_OSS) += easycap_sound_oss.o | |||
9 | obj-$(CONFIG_EASYCAP) += easycap.o | 9 | obj-$(CONFIG_EASYCAP) += easycap.o |
10 | 10 | ||
11 | ccflags-y := -Wall | 11 | ccflags-y := -Wall |
12 | ccflags-y += -DEASYCAP_IS_VIDEODEV_CLIENT | ||
13 | 12 | ||
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h index a80d023a8f0..1f94e2389ef 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/easycap/easycap.h | |||
@@ -29,7 +29,6 @@ | |||
29 | * THE FOLLOWING PARAMETERS ARE UNDEFINED: | 29 | * THE FOLLOWING PARAMETERS ARE UNDEFINED: |
30 | * | 30 | * |
31 | * EASYCAP_DEBUG | 31 | * EASYCAP_DEBUG |
32 | * EASYCAP_IS_VIDEODEV_CLIENT | ||
33 | * | 32 | * |
34 | * IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER | 33 | * IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER |
35 | * OPTIONS. | 34 | * OPTIONS. |
@@ -81,12 +80,8 @@ | |||
81 | #include <sound/initval.h> | 80 | #include <sound/initval.h> |
82 | #include <sound/control.h> | 81 | #include <sound/control.h> |
83 | #endif /* !CONFIG_EASYCAP_OSS */ | 82 | #endif /* !CONFIG_EASYCAP_OSS */ |
84 | /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ | ||
85 | #ifdef EASYCAP_IS_VIDEODEV_CLIENT | ||
86 | #include <media/v4l2-dev.h> | 83 | #include <media/v4l2-dev.h> |
87 | #include <media/v4l2-device.h> | 84 | #include <media/v4l2-device.h> |
88 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
89 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | ||
90 | #include <linux/videodev2.h> | 85 | #include <linux/videodev2.h> |
91 | #include <linux/soundcard.h> | 86 | #include <linux/soundcard.h> |
92 | 87 | ||
@@ -295,12 +290,9 @@ struct easycap { | |||
295 | int isdongle; | 290 | int isdongle; |
296 | int minor; | 291 | int minor; |
297 | 292 | ||
298 | /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ | ||
299 | #ifdef EASYCAP_IS_VIDEODEV_CLIENT | ||
300 | struct video_device video_device; | 293 | struct video_device video_device; |
301 | struct v4l2_device v4l2_device; | 294 | struct v4l2_device v4l2_device; |
302 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | 295 | |
303 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | ||
304 | int status; | 296 | int status; |
305 | unsigned int audio_pages_per_fragment; | 297 | unsigned int audio_pages_per_fragment; |
306 | unsigned int audio_bytes_per_fragment; | 298 | unsigned int audio_bytes_per_fragment; |
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c index d4d58e4bfe7..cee3252ea2d 100644 --- a/drivers/staging/easycap/easycap_main.c +++ b/drivers/staging/easycap/easycap_main.c | |||
@@ -141,38 +141,19 @@ int isdongle(struct easycap *peasycap) | |||
141 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | 141 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ |
142 | static int easycap_open(struct inode *inode, struct file *file) | 142 | static int easycap_open(struct inode *inode, struct file *file) |
143 | { | 143 | { |
144 | #ifndef EASYCAP_IS_VIDEODEV_CLIENT | ||
145 | struct usb_interface *pusb_interface; | ||
146 | #else | ||
147 | struct video_device *pvideo_device; | 144 | struct video_device *pvideo_device; |
148 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
149 | struct easycap *peasycap; | 145 | struct easycap *peasycap; |
150 | int rc; | 146 | int rc; |
151 | 147 | ||
152 | JOT(4, "\n"); | 148 | JOT(4, "\n"); |
153 | SAY("==========OPEN=========\n"); | 149 | SAY("==========OPEN=========\n"); |
154 | 150 | ||
155 | /*---------------------------------------------------------------------------*/ | ||
156 | #ifndef EASYCAP_IS_VIDEODEV_CLIENT | ||
157 | if (!inode) { | ||
158 | SAY("ERROR: inode is NULL.\n"); | ||
159 | return -EFAULT; | ||
160 | } | ||
161 | pusb_interface = usb_find_interface(&easycap_usb_driver, iminor(inode)); | ||
162 | if (!pusb_interface) { | ||
163 | SAY("ERROR: pusb_interface is NULL.\n"); | ||
164 | return -EFAULT; | ||
165 | } | ||
166 | peasycap = usb_get_intfdata(pusb_interface); | ||
167 | /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ | ||
168 | #else | ||
169 | pvideo_device = video_devdata(file); | 151 | pvideo_device = video_devdata(file); |
170 | if (!pvideo_device) { | 152 | if (!pvideo_device) { |
171 | SAY("ERROR: pvideo_device is NULL.\n"); | 153 | SAY("ERROR: pvideo_device is NULL.\n"); |
172 | return -EFAULT; | 154 | return -EFAULT; |
173 | } | 155 | } |
174 | peasycap = (struct easycap *)video_get_drvdata(pvideo_device); | 156 | peasycap = (struct easycap *)video_get_drvdata(pvideo_device); |
175 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
176 | if (!peasycap) { | 157 | if (!peasycap) { |
177 | SAY("ERROR: peasycap is NULL\n"); | 158 | SAY("ERROR: peasycap is NULL\n"); |
178 | return -EFAULT; | 159 | return -EFAULT; |
@@ -710,41 +691,11 @@ int kill_video_urbs(struct easycap *peasycap) | |||
710 | /****************************************************************************/ | 691 | /****************************************************************************/ |
711 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | 692 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ |
712 | /*--------------------------------------------------------------------------*/ | 693 | /*--------------------------------------------------------------------------*/ |
713 | static int easycap_release(struct inode *inode, struct file *file) | ||
714 | { | ||
715 | #ifndef EASYCAP_IS_VIDEODEV_CLIENT | ||
716 | struct easycap *peasycap; | ||
717 | |||
718 | |||
719 | peasycap = file->private_data; | ||
720 | if (!peasycap) { | ||
721 | SAY("ERROR: peasycap is NULL.\n"); | ||
722 | SAY("ending unsuccessfully\n"); | ||
723 | return -EFAULT; | ||
724 | } | ||
725 | if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { | ||
726 | SAY("ERROR: bad peasycap: %p\n", peasycap); | ||
727 | return -EFAULT; | ||
728 | } | ||
729 | if (0 != kill_video_urbs(peasycap)) { | ||
730 | SAM("ERROR: kill_video_urbs() failed\n"); | ||
731 | return -EFAULT; | ||
732 | } | ||
733 | JOM(4, "ending successfully\n"); | ||
734 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
735 | |||
736 | return 0; | ||
737 | } | ||
738 | #ifdef EASYCAP_IS_VIDEODEV_CLIENT | ||
739 | static int easycap_open_noinode(struct file *file) | 694 | static int easycap_open_noinode(struct file *file) |
740 | { | 695 | { |
741 | return easycap_open(NULL, file); | 696 | return easycap_open(NULL, file); |
742 | } | 697 | } |
743 | 698 | ||
744 | static int easycap_release_noinode(struct file *file) | ||
745 | { | ||
746 | return easycap_release(NULL, file); | ||
747 | } | ||
748 | static int videodev_release(struct video_device *pvideo_device) | 699 | static int videodev_release(struct video_device *pvideo_device) |
749 | { | 700 | { |
750 | struct easycap *peasycap; | 701 | struct easycap *peasycap; |
@@ -766,7 +717,6 @@ static int videodev_release(struct video_device *pvideo_device) | |||
766 | JOM(4, "ending successfully\n"); | 717 | JOM(4, "ending successfully\n"); |
767 | return 0; | 718 | return 0; |
768 | } | 719 | } |
769 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
770 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | 720 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ |
771 | /*****************************************************************************/ | 721 | /*****************************************************************************/ |
772 | /*--------------------------------------------------------------------------*/ | 722 | /*--------------------------------------------------------------------------*/ |
@@ -3011,7 +2961,6 @@ static void easycap_complete(struct urb *purb) | |||
3011 | static const struct file_operations easycap_fops = { | 2961 | static const struct file_operations easycap_fops = { |
3012 | .owner = THIS_MODULE, | 2962 | .owner = THIS_MODULE, |
3013 | .open = easycap_open, | 2963 | .open = easycap_open, |
3014 | .release = easycap_release, | ||
3015 | .unlocked_ioctl = easycap_unlocked_ioctl, | 2964 | .unlocked_ioctl = easycap_unlocked_ioctl, |
3016 | .poll = easycap_poll, | 2965 | .poll = easycap_poll, |
3017 | .mmap = easycap_mmap, | 2966 | .mmap = easycap_mmap, |
@@ -3023,16 +2972,13 @@ static const struct usb_class_driver easycap_class = { | |||
3023 | .minor_base = USB_SKEL_MINOR_BASE, | 2972 | .minor_base = USB_SKEL_MINOR_BASE, |
3024 | }; | 2973 | }; |
3025 | /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ | 2974 | /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ |
3026 | #ifdef EASYCAP_IS_VIDEODEV_CLIENT | ||
3027 | static const struct v4l2_file_operations v4l2_fops = { | 2975 | static const struct v4l2_file_operations v4l2_fops = { |
3028 | .owner = THIS_MODULE, | 2976 | .owner = THIS_MODULE, |
3029 | .open = easycap_open_noinode, | 2977 | .open = easycap_open_noinode, |
3030 | .release = easycap_release_noinode, | ||
3031 | .unlocked_ioctl = easycap_unlocked_ioctl, | 2978 | .unlocked_ioctl = easycap_unlocked_ioctl, |
3032 | .poll = easycap_poll, | 2979 | .poll = easycap_poll, |
3033 | .mmap = easycap_mmap, | 2980 | .mmap = easycap_mmap, |
3034 | }; | 2981 | }; |
3035 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
3036 | /*****************************************************************************/ | 2982 | /*****************************************************************************/ |
3037 | /*---------------------------------------------------------------------------*/ | 2983 | /*---------------------------------------------------------------------------*/ |
3038 | /* | 2984 | /* |
@@ -3073,11 +3019,7 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, | |||
3073 | struct easycap_format *peasycap_format; | 3019 | struct easycap_format *peasycap_format; |
3074 | int fmtidx; | 3020 | int fmtidx; |
3075 | struct inputset *inputset; | 3021 | struct inputset *inputset; |
3076 | /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ | ||
3077 | #ifdef EASYCAP_IS_VIDEODEV_CLIENT | ||
3078 | struct v4l2_device *pv4l2_device; | 3022 | struct v4l2_device *pv4l2_device; |
3079 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
3080 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | ||
3081 | 3023 | ||
3082 | /*---------------------------------------------------------------------------*/ | 3024 | /*---------------------------------------------------------------------------*/ |
3083 | /* | 3025 | /* |
@@ -3351,7 +3293,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, | |||
3351 | bInterfaceNumber); | 3293 | bInterfaceNumber); |
3352 | return -ENODEV; | 3294 | return -ENODEV; |
3353 | } | 3295 | } |
3354 | #ifdef EASYCAP_IS_VIDEODEV_CLIENT | ||
3355 | /*---------------------------------------------------------------------------*/ | 3296 | /*---------------------------------------------------------------------------*/ |
3356 | /* | 3297 | /* |
3357 | * SOME VERSIONS OF THE videodev MODULE OVERWRITE THE DATA WHICH HAS | 3298 | * SOME VERSIONS OF THE videodev MODULE OVERWRITE THE DATA WHICH HAS |
@@ -3369,7 +3310,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, | |||
3369 | peasycap = (struct easycap *) | 3310 | peasycap = (struct easycap *) |
3370 | container_of(pv4l2_device, struct easycap, v4l2_device); | 3311 | container_of(pv4l2_device, struct easycap, v4l2_device); |
3371 | } | 3312 | } |
3372 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
3373 | } | 3313 | } |
3374 | /*---------------------------------------------------------------------------*/ | 3314 | /*---------------------------------------------------------------------------*/ |
3375 | if ((USB_CLASS_VIDEO == bInterfaceClass) || | 3315 | if ((USB_CLASS_VIDEO == bInterfaceClass) || |
@@ -3926,19 +3866,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, | |||
3926 | * THE VIDEO DEVICE CAN BE REGISTERED NOW, AS IT IS READY. | 3866 | * THE VIDEO DEVICE CAN BE REGISTERED NOW, AS IT IS READY. |
3927 | */ | 3867 | */ |
3928 | /*--------------------------------------------------------------------------*/ | 3868 | /*--------------------------------------------------------------------------*/ |
3929 | #ifndef EASYCAP_IS_VIDEODEV_CLIENT | ||
3930 | if (0 != (usb_register_dev(pusb_interface, &easycap_class))) { | ||
3931 | err("Not able to get a minor for this device"); | ||
3932 | usb_set_intfdata(pusb_interface, NULL); | ||
3933 | return -ENODEV; | ||
3934 | } else { | ||
3935 | (peasycap->registered_video)++; | ||
3936 | SAM("easycap attached to minor #%d\n", pusb_interface->minor); | ||
3937 | peasycap->minor = pusb_interface->minor; | ||
3938 | break; | ||
3939 | } | ||
3940 | /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ | ||
3941 | #else | ||
3942 | if (0 != (v4l2_device_register(&(pusb_interface->dev), | 3869 | if (0 != (v4l2_device_register(&(pusb_interface->dev), |
3943 | &(peasycap->v4l2_device)))) { | 3870 | &(peasycap->v4l2_device)))) { |
3944 | SAM("v4l2_device_register() failed\n"); | 3871 | SAM("v4l2_device_register() failed\n"); |
@@ -3977,7 +3904,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, | |||
3977 | peasycap->video_device.minor); | 3904 | peasycap->video_device.minor); |
3978 | peasycap->minor = peasycap->video_device.minor; | 3905 | peasycap->minor = peasycap->video_device.minor; |
3979 | } | 3906 | } |
3980 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
3981 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | 3907 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ |
3982 | 3908 | ||
3983 | break; | 3909 | break; |
@@ -4330,11 +4256,7 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface) | |||
4330 | struct list_head *plist_head; | 4256 | struct list_head *plist_head; |
4331 | struct data_urb *pdata_urb; | 4257 | struct data_urb *pdata_urb; |
4332 | int minor, m, kd; | 4258 | int minor, m, kd; |
4333 | /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ | ||
4334 | #ifdef EASYCAP_IS_VIDEODEV_CLIENT | ||
4335 | struct v4l2_device *pv4l2_device; | 4259 | struct v4l2_device *pv4l2_device; |
4336 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
4337 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | ||
4338 | 4260 | ||
4339 | JOT(4, "\n"); | 4261 | JOT(4, "\n"); |
4340 | 4262 | ||
@@ -4361,8 +4283,6 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface) | |||
4361 | return; | 4283 | return; |
4362 | } | 4284 | } |
4363 | /*---------------------------------------------------------------------------*/ | 4285 | /*---------------------------------------------------------------------------*/ |
4364 | #ifdef EASYCAP_IS_VIDEODEV_CLIENT | ||
4365 | /*---------------------------------------------------------------------------*/ | ||
4366 | /* | 4286 | /* |
4367 | * SOME VERSIONS OF THE videodev MODULE OVERWRITE THE DATA WHICH HAS | 4287 | * SOME VERSIONS OF THE videodev MODULE OVERWRITE THE DATA WHICH HAS |
4368 | * BEEN WRITTEN BY THE CALL TO usb_set_intfdata() IN easycap_usb_probe(), | 4288 | * BEEN WRITTEN BY THE CALL TO usb_set_intfdata() IN easycap_usb_probe(), |
@@ -4379,7 +4299,6 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface) | |||
4379 | peasycap = (struct easycap *) | 4299 | peasycap = (struct easycap *) |
4380 | container_of(pv4l2_device, struct easycap, v4l2_device); | 4300 | container_of(pv4l2_device, struct easycap, v4l2_device); |
4381 | } | 4301 | } |
4382 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
4383 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | 4302 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ |
4384 | /*---------------------------------------------------------------------------*/ | 4303 | /*---------------------------------------------------------------------------*/ |
4385 | if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { | 4304 | if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { |
@@ -4463,17 +4382,6 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface) | |||
4463 | SAY("ERROR: %i=kd is bad: cannot lock dongle\n", kd); | 4382 | SAY("ERROR: %i=kd is bad: cannot lock dongle\n", kd); |
4464 | } | 4383 | } |
4465 | /*---------------------------------------------------------------------------*/ | 4384 | /*---------------------------------------------------------------------------*/ |
4466 | #ifndef EASYCAP_IS_VIDEODEV_CLIENT | ||
4467 | if (!peasycap) { | ||
4468 | SAM("ERROR: peasycap has become NULL\n"); | ||
4469 | } else { | ||
4470 | usb_deregister_dev(pusb_interface, &easycap_class); | ||
4471 | peasycap->registered_video--; | ||
4472 | JOM(4, "intf[%i]: usb_deregister_dev() minor = %i\n", | ||
4473 | bInterfaceNumber, minor); | ||
4474 | } | ||
4475 | /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ | ||
4476 | #else | ||
4477 | if (!peasycap->v4l2_device.name[0]) { | 4385 | if (!peasycap->v4l2_device.name[0]) { |
4478 | SAM("ERROR: peasycap->v4l2_device.name is empty\n"); | 4386 | SAM("ERROR: peasycap->v4l2_device.name is empty\n"); |
4479 | if (0 <= kd && DONGLE_MANY > kd) | 4387 | if (0 <= kd && DONGLE_MANY > kd) |
@@ -4489,7 +4397,6 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface) | |||
4489 | JOM(4, "intf[%i]: video_unregister_device() minor=%i\n", | 4397 | JOM(4, "intf[%i]: video_unregister_device() minor=%i\n", |
4490 | bInterfaceNumber, minor); | 4398 | bInterfaceNumber, minor); |
4491 | peasycap->registered_video--; | 4399 | peasycap->registered_video--; |
4492 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
4493 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | 4400 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ |
4494 | 4401 | ||
4495 | if (0 <= kd && DONGLE_MANY > kd) { | 4402 | if (0 <= kd && DONGLE_MANY > kd) { |
diff --git a/drivers/staging/easycap/easycap_sound_oss.c b/drivers/staging/easycap/easycap_sound_oss.c index d3980a62a16..d92baf22276 100644 --- a/drivers/staging/easycap/easycap_sound_oss.c +++ b/drivers/staging/easycap/easycap_sound_oss.c | |||
@@ -277,11 +277,7 @@ static int easyoss_open(struct inode *inode, struct file *file) | |||
277 | struct usb_interface *pusb_interface; | 277 | struct usb_interface *pusb_interface; |
278 | struct easycap *peasycap; | 278 | struct easycap *peasycap; |
279 | int subminor; | 279 | int subminor; |
280 | /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ | ||
281 | #ifdef EASYCAP_IS_VIDEODEV_CLIENT | ||
282 | struct v4l2_device *pv4l2_device; | 280 | struct v4l2_device *pv4l2_device; |
283 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
284 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | ||
285 | 281 | ||
286 | JOT(4, "begins\n"); | 282 | JOT(4, "begins\n"); |
287 | 283 | ||
@@ -300,8 +296,6 @@ static int easyoss_open(struct inode *inode, struct file *file) | |||
300 | return -1; | 296 | return -1; |
301 | } | 297 | } |
302 | /*---------------------------------------------------------------------------*/ | 298 | /*---------------------------------------------------------------------------*/ |
303 | #ifdef EASYCAP_IS_VIDEODEV_CLIENT | ||
304 | /*---------------------------------------------------------------------------*/ | ||
305 | /* | 299 | /* |
306 | * SOME VERSIONS OF THE videodev MODULE OVERWRITE THE DATA WHICH HAS | 300 | * SOME VERSIONS OF THE videodev MODULE OVERWRITE THE DATA WHICH HAS |
307 | * BEEN WRITTEN BY THE CALL TO usb_set_intfdata() IN easycap_usb_probe(), | 301 | * BEEN WRITTEN BY THE CALL TO usb_set_intfdata() IN easycap_usb_probe(), |
@@ -318,8 +312,6 @@ static int easyoss_open(struct inode *inode, struct file *file) | |||
318 | peasycap = container_of(pv4l2_device, | 312 | peasycap = container_of(pv4l2_device, |
319 | struct easycap, v4l2_device); | 313 | struct easycap, v4l2_device); |
320 | } | 314 | } |
321 | #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ | ||
322 | /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ | ||
323 | /*---------------------------------------------------------------------------*/ | 315 | /*---------------------------------------------------------------------------*/ |
324 | if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { | 316 | if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { |
325 | SAY("ERROR: bad peasycap: %p\n", peasycap); | 317 | SAY("ERROR: bad peasycap: %p\n", peasycap); |