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

[sfrench/cifs-2.6.git] / drivers / media / dvb / dvb-usb / opera1.c

diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c
index 21935bf7059ee34f976914d82aaf22cd88fadb5d..302cc67407c397e17091bc729c078e9d63f54031 100644 (file)
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -478,9 +478,9 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev,
                                err("could not restart the USB controller CPU.");
                                ret = -EINVAL;
                        }
-                       kfree(p);
                }
        }
+       kfree(p);
        if (fw) {
                release_firmware(fw);
        }