1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 6e81f970dc7d..829a41b0c9ef 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -337,7 +337,7 @@ static inline int cx231xx_isoc_copy(struct cx231xx *dev, struct urb *urb)
         if (!dev)
                 return 0;
 
-        if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
+        if (dev->state & DEV_DISCONNECTED)
                 return 0;
 
         if (urb->status < 0) {
@@ -440,7 +440,7 @@ static inline int cx231xx_bulk_copy(struct cx231xx *dev, struct urb *urb)
         if (!dev)
                 return 0;
 
-        if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
+        if (dev->state & DEV_DISCONNECTED)
                 return 0;
 
         if (urb->status < 0) {
@@ -1000,12 +1000,6 @@ static int check_dev(struct cx231xx *dev)
                 cx231xx_errdev("v4l2 ioctl: device not present\n");
                 return -ENODEV;
         }
-
-        if (dev->state & DEV_MISCONFIGURED) {
-                cx231xx_errdev("v4l2 ioctl: device is misconfigured; "
-                               "close and open it again\n");
-                return -EIO;
-        }
         return 0;
 }
 
@@ -2347,7 +2341,8 @@ static int cx231xx_v4l2_close(struct file *filp)
                         return 0;
                 }
 
-        if (dev->users == 1) {
+        dev->users--;
+        if (!dev->users) {
                 videobuf_stop(&fh->vb_vidq);
                 videobuf_mmap_free(&fh->vb_vidq);
 
@@ -2374,7 +2369,6 @@ static int cx231xx_v4l2_close(struct file *filp)
                 cx231xx_set_alt_setting(dev, INDEX_VIDEO, 0);
         }
         kfree(fh);
-        dev->users--;
         wake_up_interruptible_nr(&dev->open, 1);
         return 0;
 }