dvb-usb/opera1.c: fix a memory leak
PATCH 1/1 dvb-usb/opera1.c: fix a memory leak
This patch fixes a memory leak in the "testval == 0x67" case spotted by the Coverity checker.
Signed-off-by Adrian Bunk <[email protected]>
---
drivers/media/dvb/dvb-usb/opera1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/dvb/dvb-usb/opera1.c renamed from drivers/media/dvb/dvb-usb/opera1.c.old +1 -1
@@ -450,65 +450,65 @@ static int opera1_xilinx_load_firmware(s p =kmalloc (fw->size,GFP_KERNEL );opera1_xilinx_rw (dev,0xbc ,0x00 , &testval,1 ,OPERA_READ_MSG );if (p !=NULL && testval !=0x67 ) {u8 reset =0 , fpga_command =0 ;memcpy (p, fw->data, fw->size);/* clear fpga ? */ opera1_xilinx_rw (dev,0xbc ,0xaa , &fpga_command,1 ,OPERA_WRITE_MSG );for (i =0 ; i < fw->size;) {if ( (fw->size - i) <fpgasize){ fpgasize=fw->size-i; } b = (u8 *) p + i;if (opera1_xilinx_rw (dev,OPERA_WRITE_FX2 ,0x0 , b , fpgasize,OPERA_WRITE_MSG ) != fpgasize ) {err ("error while transferring firmware" ); ret = -EINVAL ;break ; } i = i + fpgasize; }/* restart the CPU */ if (ret ||opera1_xilinx_rw (dev,0xa0 ,0xe600 , &reset,1 ,OPERA_WRITE_MSG ) !=1 ) {err ("could not restart the USB controller CPU." ); ret = -EINVAL ; } -kfree (p); } } +kfree (p);if (fw) {release_firmware (fw); }return ret; }static struct dvb_usb_device_properties opera1_properties = { .caps =DVB_USB_IS_AN_I2C_ADAPTER , .usb_ctrl =CYPRESS_FX2 , .firmware ="dvb-usb-opera-01.fw" , .size_of_priv =sizeof (struct opera1_state ), .power_ctrl = opera1_power_ctrl, .i2c_algo = &opera1_i2c_algo, .rc_key_map = opera1_rc_keys, .rc_key_map_size =ARRAY_SIZE (opera1_rc_keys), .rc_interval =200 , .rc_query = opera1_rc_query, .read_mac_address = opera1_read_mac_address, .generic_bulk_ctrl_endpoint =0x00 ,/* parameter for the MPEG2-data transfer */ .num_adapters =1 , .adapter = { { .frontend_attach = opera1_frontend_attach, .streaming_ctrl = opera1_streaming_ctrl, .tuner_attach = opera1_tuner_attach, .caps =DVB_USB_ADAP_HAS_PID_FILTER |DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF ,