3 files changed, 0 insertions, 9 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index fcc713f8098d..20a7e24de6fb 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -2945,9 +2945,6 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
         dev->udev = udev;
         mutex_init(&dev->ctrl_urb_lock);
         spin_lock_init(&dev->slock);
-        init_waitqueue_head(&dev->open);
-        init_waitqueue_head(&dev->wait_frame);
-        init_waitqueue_head(&dev->wait_stream);
 
         dev->em28xx_write_regs = em28xx_write_regs;
         dev->em28xx_read_reg = em28xx_read_reg;
@@ -3385,8 +3382,6 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
            resources */
         mutex_lock(&dev->lock);
 
-        wake_up_interruptible_all(&dev->open);
-
         v4l2_device_disconnect(&dev->v4l2_dev);
 
         if (dev->users) {
@@ -3398,8 +3393,6 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
                 dev->state |= DEV_MISCONFIGURED;
                 em28xx_uninit_isoc(dev, dev->mode);
                 dev->state |= DEV_DISCONNECTED;
-                wake_up_interruptible(&dev->wait_frame);
-                wake_up_interruptible(&dev->wait_stream);
         } else {
                 dev->state |= DEV_DISCONNECTED;
                 em28xx_release_resources(dev);
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 308a1dd08cfb..1d4068052ef0 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2284,7 +2284,6 @@ static int em28xx_v4l2_close(struct file *filp)
         videobuf_mmap_free(&fh->vb_vbiq);
         kfree(fh);
         dev->users--;
-        wake_up_interruptible_nr(&dev->open, 1);
         return 0;
 }
 
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index a3f77f6f5d95..8757523e6863 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -570,7 +570,6 @@ struct em28xx {
         struct mutex ctrl_urb_lock;     /* protects urb_buf */
         /* spinlock_t queue_lock; */
         struct list_head inqueue, outqueue;
-        wait_queue_head_t open, wait_frame, wait_stream;
         struct video_device *vbi_dev;
         struct video_device *radio_dev;