Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 1 insertions, 1 deletions

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 */