diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-21 15:43:05 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 15:43:05 (GMT) |
| commit | 2198a10b501fd4443430cb17e065a9e859cc58c9 (patch) | |
| tree | 87f3781d293da0f8f8f61615905eb7bf62b7c128 /drivers/media/dvb/dvb-usb/opera1.c | |
| parent | 9941fb62762253774cc6177d0b9172ece5133fe1 (diff) | |
| parent | db5a753bf198ef7a50e17d2ff358adf37efe8648 (diff) | |
| download | linux-2198a10b501fd4443430cb17e065a9e859cc58c9.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'drivers/media/dvb/dvb-usb/opera1.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/opera1.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c index 6b22ec6..f896337 100644 --- a/drivers/media/dvb/dvb-usb/opera1.c +++ b/drivers/media/dvb/dvb-usb/opera1.c @@ -483,9 +483,7 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev, } } kfree(p); - if (fw) { - release_firmware(fw); - } + release_firmware(fw); return ret; } |