Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (255 commits)
  [media] radio-aimslab.c: Fix gcc 4.5+ bug
  [media] cx25821: Fix compilation breakage due to BKL dependency
  [media] v4l2-compat-ioctl32: fix compile warning
  [media] zoran: fix compiler warning
  [media] tda18218: fix compile warning
  [media] ngene: fix compile warning
  [media] DVB: IR support for TechnoTrend CT-3650
  [media] cx23885, cimax2.c: Fix case of two CAM insertion irq
  [media] ir-nec-decoder: fix repeat key issue
  [media] staging: se401 depends on USB
  [media] staging: usbvideo/vicam depends on USB
  [media] soc_camera: Add the ability to bind regulators to soc_camedra devices
  [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor
  [media] v4l: soc-camera: switch to .unlocked_ioctl
  [media] v4l: ov772x: simplify pointer dereference
  [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
  [media] ov9640: use macro to request OmniVision OV9640 sensor private data
  [media] ivtv-i2c: Fix two warnings
  [media] staging/lirc: Update lirc TODO files
  [media] cx88: Remove the obsolete i2c_adapter.id field
  ...

1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/media/video/saa7164/saa7164-fw.c b/drivers/media/video/saa7164/saa7164-fw.c
index 484533c32bb1..ebed6f786a23 100644
--- a/drivers/media/video/saa7164/saa7164-fw.c
+++ b/drivers/media/video/saa7164/saa7164-fw.c
@@ -178,7 +178,7 @@ int saa7164_downloadimage(struct saa7164_dev *dev, u8 *src, u32 srcsize,
                         goto out;
                 }
 
-                msleep(10);
+                msleep(10); /* Checkpatch throws a < 20ms warning */
                 if (timeout++ > 60)
                         break;
         }
@@ -235,7 +235,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
                 while (err_flags != SAA_DEVICE_IMAGE_BOOTING) {
                         dprintk(DBGLVL_FW, "%s() err_flags = %x\n",
                                 __func__, err_flags);
-                        msleep(10);
+                        msleep(10); /* Checkpatch throws a < 20ms warning */
 
                         if (err_flags & SAA_DEVICE_IMAGE_CORRUPT) {
                                 printk(KERN_ERR "%s() firmware corrupt\n",
@@ -294,7 +294,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
                         while (err_flags != SAA_DEVICE_IMAGE_BOOTING) {
                                 dprintk(DBGLVL_FW, "%s() err_flags2 = %x\n",
                                         __func__, err_flags);
-                                msleep(10);
+                                msleep(10); /* Checkpatch throws a < 20ms warning */
 
                                 if (err_flags & SAA_DEVICE_IMAGE_CORRUPT) {
                                         printk(KERN_ERR
@@ -365,7 +365,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
 
                         first_timeout = SAA_DEVICE_TIMEOUT;
                         while (first_timeout) {
-                                msleep(10);
+                                msleep(10); /* Checkpatch throws a < 20ms warning */
 
                                 version =
                                         saa7164_getcurrentfirmwareversion(dev);
@@ -608,8 +608,6 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
         ret = 0;
 
 out:
-        if (fw)
-                release_firmware(fw);
-
+        release_firmware(fw);
         return ret;
 }