4 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index 55671cb5255e..87c286ee6a00 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -896,9 +896,9 @@ static int nxt2002_init(struct dvb_frontend* fe)
         }
 
         ret = nxt2002_load_firmware(fe, fw);
+        release_firmware(fw);
         if (ret) {
                 printk("nxt2002: Writing firmware to device failed\n");
-                release_firmware(fw);
                 return ret;
         }
         printk("nxt2002: Firmware upload complete\n");
@@ -960,9 +960,9 @@ static int nxt2004_init(struct dvb_frontend* fe)
         }
 
         ret = nxt2004_load_firmware(fe, fw);
+        release_firmware(fw);
         if (ret) {
                 printk("nxt2004: Writing firmware to device failed\n");
-                release_firmware(fw);
                 return ret;
         }
         printk("nxt2004: Firmware upload complete\n");
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
index 26bed616fabe..2bf124b53689 100644
--- a/drivers/media/dvb/frontends/or51211.c
+++ b/drivers/media/dvb/frontends/or51211.c
@@ -437,10 +437,10 @@ static int or51211_init(struct dvb_frontend* fe)
                 }
 
                 ret = or51211_load_firmware(fe, fw);
+                release_firmware(fw);
                 if (ret) {
                         printk(KERN_WARNING "or51211: Writing firmware to "
                                "device failed!\n");
-                        release_firmware(fw);
                         return ret;
                 }
                 printk(KERN_INFO "or51211: Firmware upload complete.\n");
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index 44ec5b9a4695..d98fd5c2e13e 100644
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -318,7 +318,6 @@ static int sp8870_init (struct dvb_frontend* fe)
         printk("sp8870: waiting for firmware upload (%s)...\n", SP8870_DEFAULT_FIRMWARE);
         if (state->config->request_firmware(fe, &fw, SP8870_DEFAULT_FIRMWARE)) {
                 printk("sp8870: no firmware upload (timeout or file not found?)\n");
-                release_firmware(fw);
                 return -EIO;
         }
 
@@ -327,6 +326,7 @@ static int sp8870_init (struct dvb_frontend* fe)
                 release_firmware(fw);
                 return -EIO;
         }
+        release_firmware(fw);
         printk("sp8870: firmware upload complete\n");
 
         /* enable TS output and interface pins */
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index b0a2b02f6608..5c2f8f4e0ae5 100644
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -520,9 +520,9 @@ static int sp887x_init(struct dvb_frontend* fe)
                 }
 
                 ret = sp887x_initial_setup(fe, fw);
+                release_firmware(fw);
                 if (ret) {
                         printk("sp887x: writing firmware to device failed\n");
-                        release_firmware(fw);
                         return ret;
                 }
                 printk("sp887x: firmware upload complete\n");