Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4309
b: refs/heads/master
c: 0c744b0
h: refs/heads/master
i:
  4307: f176539
v: v3
  • Loading branch information
Anssi Hannula authored and Linus Torvalds committed Jul 8, 2005
1 parent 66a46ff commit 914245e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3faadbb0fde3c53e1c4f13eabb478c0c7cb1e4dd
refs/heads/master: 0c744b010078bd65724477e75261e51712d290a0
2 changes: 2 additions & 0 deletions trunk/drivers/media/dvb/frontends/tda1004x.c
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ static int tda10045_fwupload(struct dvb_frontend* fe)
tda10045h_set_bandwidth(state, BANDWIDTH_8_MHZ);

ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10045H_FWPAGE, TDA10045H_CODE_IN);
release_firmware(fw);
if (ret)
return ret;
printk(KERN_INFO "tda1004x: firmware upload complete\n");
Expand Down Expand Up @@ -452,6 +453,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
}
tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 8); // going to boot from HOST
ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10046H_CODE_CPT, TDA10046H_CODE_IN);
release_firmware(fw);
if (ret)
return ret;
} else {
Expand Down
11 changes: 9 additions & 2 deletions trunk/drivers/media/dvb/ttusb-dec/ttusb_dec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1281,6 +1281,7 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec)
if (firmware_size < 60) {
printk("%s: firmware size too small for DSP code (%zu < 60).\n",
__FUNCTION__, firmware_size);
release_firmware(fw_entry);
return -1;
}

Expand All @@ -1294,6 +1295,7 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec)
printk("%s: crc32 check of DSP code failed (calculated "
"0x%08x != 0x%08x in file), file invalid.\n",
__FUNCTION__, crc32_csum, crc32_check);
release_firmware(fw_entry);
return -1;
}
memcpy(idstring, &firmware[36], 20);
Expand All @@ -1308,15 +1310,19 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec)

result = ttusb_dec_send_command(dec, 0x41, sizeof(b0), b0, NULL, NULL);

if (result)
if (result) {
release_firmware(fw_entry);
return result;
}

trans_count = 0;
j = 0;

b = kmalloc(ARM_PACKET_SIZE, GFP_KERNEL);
if (b == NULL)
if (b == NULL) {
release_firmware(fw_entry);
return -ENOMEM;
}

for (i = 0; i < firmware_size; i += COMMAND_PACKET_SIZE) {
size = firmware_size - i;
Expand Down Expand Up @@ -1345,6 +1351,7 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec)

result = ttusb_dec_send_command(dec, 0x43, sizeof(b1), b1, NULL, NULL);

release_firmware(fw_entry);
kfree(b);

return result;
Expand Down

0 comments on commit 914245e

Please sign in to comment.