diff options
-rw-r--r-- | Documentation/video4linux/v4l2-framework.txt | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-mr800.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt index a128e012a45c..f22f35c271f3 100644 --- a/Documentation/video4linux/v4l2-framework.txt +++ b/Documentation/video4linux/v4l2-framework.txt | |||
@@ -488,7 +488,7 @@ also waits in the code, then you should do the same to allow other processes | |||
488 | to access the device node while the first process is waiting for something. | 488 | to access the device node while the first process is waiting for something. |
489 | 489 | ||
490 | The implementation of a hotplug disconnect should also take the lock before | 490 | The implementation of a hotplug disconnect should also take the lock before |
491 | calling v4l2_device_disconnect and video_unregister_device. | 491 | calling v4l2_device_disconnect. |
492 | 492 | ||
493 | video_device registration | 493 | video_device registration |
494 | ------------------------- | 494 | ------------------------- |
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c index 97967ad3cd12..2f56b26cece9 100644 --- a/drivers/media/radio/radio-mr800.c +++ b/drivers/media/radio/radio-mr800.c | |||
@@ -285,8 +285,8 @@ static void usb_amradio_disconnect(struct usb_interface *intf) | |||
285 | 285 | ||
286 | mutex_lock(&radio->lock); | 286 | mutex_lock(&radio->lock); |
287 | v4l2_device_disconnect(&radio->v4l2_dev); | 287 | v4l2_device_disconnect(&radio->v4l2_dev); |
288 | video_unregister_device(&radio->videodev); | ||
289 | mutex_unlock(&radio->lock); | 288 | mutex_unlock(&radio->lock); |
289 | video_unregister_device(&radio->videodev); | ||
290 | } | 290 | } |
291 | 291 | ||
292 | /* vidioc_querycap - query device capabilities */ | 292 | /* vidioc_querycap - query device capabilities */ |