diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-19 22:38:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-19 22:38:59 -0400 |
| commit | 14d4962dc863ab42e898d66d4837aa6c3afedc3b (patch) | |
| tree | 780cb53645b781dfd33b6d0ad21e0596f2ad1a1a /drivers/media/dvb/dvb-usb/opera1.c | |
| parent | 9717967c4b704ce344c954afb5bb160aa9c01c34 (diff) | |
| parent | 2b666ca4a68cbc22483b0f2e1ba3c0e59b01ae9e (diff) | |
Merge branch 'linus' into irq/core
Merge reason: update to almost-final-.36
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 6b22ec64ab0c..f896337b4535 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, | |||
| 483 | } | 483 | } |
| 484 | } | 484 | } |
| 485 | kfree(p); | 485 | kfree(p); |
| 486 | if (fw) { | 486 | release_firmware(fw); |
| 487 | release_firmware(fw); | ||
| 488 | } | ||
| 489 | return ret; | 487 | return ret; |
| 490 | } | 488 | } |
| 491 | 489 | ||