Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / saa7164 / saa7164-fw.c

diff --git a/drivers/media/video/saa7164/saa7164-fw.c b/drivers/media/video/saa7164/saa7164-fw.c
index 484533c32bb18da44490304bb1a98707ed84e6cc..ebed6f786a23750a69d17df841924563b66a9123 100644 (file)
--- 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;
 }