6 files changed, 75 insertions, 22 deletions

diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index c08f650df423..ef5361824f87 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -356,6 +356,7 @@ static int cafe_smbus_write_data(struct cafe_camera *cam,
 {
         unsigned int rval;
         unsigned long flags;
+        DEFINE_WAIT(the_wait);
 
         spin_lock_irqsave(&cam->dev_lock, flags);
         rval = TWSIC0_EN | ((addr << TWSIC0_SID_SHIFT) & TWSIC0_SID);
@@ -369,10 +370,29 @@ static int cafe_smbus_write_data(struct cafe_camera *cam,
         rval = value | ((command << TWSIC1_ADDR_SHIFT) & TWSIC1_ADDR);
         cafe_reg_write(cam, REG_TWSIC1, rval);
         spin_unlock_irqrestore(&cam->dev_lock, flags);
-        msleep(2); /* Required or things flake */
 
+        /*
+         * Time to wait for the write to complete.  THIS IS A RACY
+         * WAY TO DO IT, but the sad fact is that reading the TWSIC1
+         * register too quickly after starting the operation sends
+         * the device into a place that may be kinder and better, but
+         * which is absolutely useless for controlling the sensor.  In
+         * practice we have plenty of time to get into our sleep state
+         * before the interrupt hits, and the worst case is that we
+         * time out and then see that things completed, so this seems
+         * the best way for now.
+         */
+        do {
+                prepare_to_wait(&cam->smbus_wait, &the_wait,
+                                TASK_UNINTERRUPTIBLE);
+                schedule_timeout(1); /* even 1 jiffy is too long */
+                finish_wait(&cam->smbus_wait, &the_wait);
+        } while (!cafe_smbus_write_done(cam));
+
+#ifdef IF_THE_CAFE_HARDWARE_WORKED_RIGHT
         wait_event_timeout(cam->smbus_wait, cafe_smbus_write_done(cam),
                         CAFE_SMBUS_TIMEOUT);
+#endif
         spin_lock_irqsave(&cam->dev_lock, flags);
         rval = cafe_reg_read(cam, REG_TWSIC1);
         spin_unlock_irqrestore(&cam->dev_lock, flags);
@@ -710,7 +730,7 @@ static void cafe_ctlr_init(struct cafe_camera *cam)
          * Here we must wait a bit for the controller to come around.
          */
         spin_unlock_irqrestore(&cam->dev_lock, flags);
-        mdelay(5);      /* FIXME revisit this */
+        msleep(5);
         spin_lock_irqsave(&cam->dev_lock, flags);
 
         cafe_reg_write(cam, REG_GL_CSR, GCSR_CCIC_EN|GCSR_SRC|GCSR_MRC);
@@ -2233,12 +2253,21 @@ static int cafe_pci_resume(struct pci_dev *pdev)
         if (ret)
                 return ret;
         ret = pci_enable_device(pdev);
+
         if (ret) {
                 cam_warn(cam, "Unable to re-enable device on resume!\n");
                 return ret;
         }
         cafe_ctlr_init(cam);
-        cafe_ctlr_power_up(cam);
+        cafe_ctlr_power_down(cam);
+
+        mutex_lock(&cam->s_mutex);
+        if (cam->users > 0) {
+                cafe_ctlr_power_up(cam);
+                __cafe_cam_reset(cam);
+        }
+        mutex_unlock(&cam->s_mutex);
+
         set_bit(CF_CONFIG_NEEDED, &cam->flags);
         if (cam->state == S_SPECREAD)
                 cam->state = S_IDLE;  /* Don't bother restarting */
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 2c7b158ce7e1..40307f3f6fe3 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1772,6 +1772,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         if (dev->alt_max_pkt_size == NULL) {
                 em28xx_errdev("out of memory!\n");
                 em28xx_devused&=~(1<<nr);
+                kfree(dev);
                 return -ENOMEM;
         }
 
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 047624b9e271..5977a79619c2 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1190,6 +1190,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
                 itv->osd_global_alpha_state = (fb->flags & V4L2_FBUF_FLAG_GLOBAL_ALPHA) != 0;
                 itv->osd_local_alpha_state = (fb->flags & V4L2_FBUF_FLAG_LOCAL_ALPHA) != 0;
                 itv->osd_color_key_state = (fb->flags & V4L2_FBUF_FLAG_CHROMAKEY) != 0;
+                ivtv_set_osd_alpha(itv);
                 break;
         }
 
@@ -1234,7 +1235,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
                 IVTV_INFO("Tuner: %s\n",
                         test_bit(IVTV_F_I_RADIO_USER, &itv->i_flags) ? "Radio" : "TV");
                 cx2341x_log_status(&itv->params, itv->name);
-                IVTV_INFO("Status flags: 0x%08lx\n", itv->i_flags);
+                IVTV_INFO("Version: %s Status flags: 0x%08lx\n", IVTV_VERSION, itv->i_flags);
                 for (i = 0; i < IVTV_MAX_STREAMS; i++) {
                         struct ivtv_stream *s = &itv->streams[i];
 
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index f8f21ddd9843..c4c5bd67f795 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -416,7 +416,10 @@ static int ov7670_read(struct i2c_client *c, unsigned char reg,
 static int ov7670_write(struct i2c_client *c, unsigned char reg,
                 unsigned char value)
 {
-        return i2c_smbus_write_byte_data(c, reg, value);
+        int ret = i2c_smbus_write_byte_data(c, reg, value);
+        if (reg == REG_COM7 && (value & COM7_RESET))
+                msleep(2);  /* Wait for reset to run */
+        return ret;
 }
 
 
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 9c0e8d18c2f6..3d81966d8c42 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1196,12 +1196,19 @@ static int pwc_video_open(struct inode *inode, struct file *file)
         return 0;
 }
 
+
+static void pwc_cleanup(struct pwc_device *pdev)
+{
+        pwc_remove_sysfs_files(pdev->vdev);
+        video_unregister_device(pdev->vdev);
+}
+
 /* Note that all cleanup is done in the reverse order as in _open */
 static int pwc_video_close(struct inode *inode, struct file *file)
 {
         struct video_device *vdev = file->private_data;
         struct pwc_device *pdev;
-        int i;
+        int i, hint;
 
         PWC_DEBUG_OPEN(">> video_close called(vdev = 0x%p).\n", vdev);
 
@@ -1224,8 +1231,9 @@ static int pwc_video_close(struct inode *inode, struct file *file)
         pwc_isoc_cleanup(pdev);
         pwc_free_buffers(pdev);
 
+        lock_kernel();
         /* Turn off LEDS and power down camera, but only when not unplugged */
-        if (pdev->error_status != EPIPE) {
+        if (!pdev->unplugged) {
                 /* Turn LEDs off */
                 if (pwc_set_leds(pdev, 0, 0) < 0)
                         PWC_DEBUG_MODULE("Failed to set LED on/off time.\n");
@@ -1234,9 +1242,19 @@ static int pwc_video_close(struct inode *inode, struct file *file)
                         if (i < 0)
                                 PWC_ERROR("Failed to power down camera (%d)\n", i);
                 }
+                pdev->vopen--;
+                PWC_DEBUG_OPEN("<< video_close() vopen=%d\n", i);
+        } else {
+                pwc_cleanup(pdev);
+                /* Free memory (don't set pdev to 0 just yet) */
+                kfree(pdev);
+                /* search device_hint[] table if we occupy a slot, by any chance */
+                for (hint = 0; hint < MAX_DEV_HINTS; hint++)
+                        if (device_hint[hint].pdev == pdev)
+                                device_hint[hint].pdev = NULL;
         }
-        pdev->vopen--;
-        PWC_DEBUG_OPEN("<< video_close() vopen=%d\n", pdev->vopen);
+        unlock_kernel();
+
         return 0;
 }
 
@@ -1791,21 +1809,21 @@ static void usb_pwc_disconnect(struct usb_interface *intf)
         /* Alert waiting processes */
         wake_up_interruptible(&pdev->frameq);
         /* Wait until device is closed */
-        while (pdev->vopen)
-                schedule();
-        /* Device is now closed, so we can safely unregister it */
-        PWC_DEBUG_PROBE("Unregistering video device in disconnect().\n");
-        pwc_remove_sysfs_files(pdev->vdev);
-        video_unregister_device(pdev->vdev);
-
-        /* Free memory (don't set pdev to 0 just yet) */
-        kfree(pdev);
+        if(pdev->vopen) {
+                pdev->unplugged = 1;
+        } else {
+                /* Device is closed, so we can safely unregister it */
+                PWC_DEBUG_PROBE("Unregistering video device in disconnect().\n");
+                pwc_cleanup(pdev);
+                /* Free memory (don't set pdev to 0 just yet) */
+                kfree(pdev);
 
 disconnect_out:
-        /* search device_hint[] table if we occupy a slot, by any chance */
-        for (hint = 0; hint < MAX_DEV_HINTS; hint++)
-                if (device_hint[hint].pdev == pdev)
-                        device_hint[hint].pdev = NULL;
+                /* search device_hint[] table if we occupy a slot, by any chance */
+                for (hint = 0; hint < MAX_DEV_HINTS; hint++)
+                        if (device_hint[hint].pdev == pdev)
+                                device_hint[hint].pdev = NULL;
+        }
 
         unlock_kernel();
 }
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h
index 910a04f53920..8e8e5b27e77e 100644
--- a/drivers/media/video/pwc/pwc.h
+++ b/drivers/media/video/pwc/pwc.h
@@ -193,6 +193,7 @@ struct pwc_device
    char vsnapshot;              /* snapshot mode */
    char vsync;                  /* used by isoc handler */
    char vmirror;                /* for ToUCaM series */
+        char unplugged;
 
    int cmd_len;
    unsigned char cmd_buf[13];