niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

[media] go7007: remember boot firmware

Browse source 
Don't load it everytime you stop encoding. Instead remember it.
Another reason for not loading it every time is that this could
be called from within the release() file operation, which turns
out to be deadly.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2013-03-09 10:37:52 -03:00 • committed by Mauro Carvalho Chehab
parent 9b6ebf3309
commit 95ef39403f
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/media/go7007/go7007-driver.c
View file

@ -95,34 +95,34 @@ static int go7007_load_encoder(struct go7007 *go)
int fw_len, rv = 0; int fw_len, rv = 0;
u16 intr_val, intr_data; u16 intr_val, intr_data;
if (go->boot_fw == NULL) {
if (request_firmware(&fw_entry, fw_name, go->dev)) { if (request_firmware(&fw_entry, fw_name, go->dev)) {
v4l2_err(go, "unable to load firmware from file " v4l2_err(go, "unable to load firmware from file \"%s\"\n", fw_name);
"\"%s\"\n", fw_name);
return -1; return -1;
} }
if (fw_entry->size < 16 || memcmp(fw_entry->data, "WISGO7007FW", 11)) { if (fw_entry->size < 16 || memcmp(fw_entry->data, "WISGO7007FW", 11)) {
v4l2_err(go, "file \"%s\" does not appear to be " v4l2_err(go, "file \"%s\" does not appear to be go7007 firmware\n", fw_name);
"go7007 firmware\n", fw_name);
release_firmware(fw_entry); release_firmware(fw_entry);
return -1; return -1;
} }
fw_len = fw_entry->size - 16; fw_len = fw_entry->size - 16;
bounce = kmemdup(fw_entry->data + 16, fw_len, GFP_KERNEL); bounce = kmemdup(fw_entry->data + 16, fw_len, GFP_KERNEL);
if (bounce == NULL) { if (bounce == NULL) {
v4l2_err(go, "unable to allocate %d bytes for " v4l2_err(go, "unable to allocate %d bytes for firmware transfer\n", fw_len);
"firmware transfer\n", fw_len);
release_firmware(fw_entry); release_firmware(fw_entry);
return -1; return -1;
} }
release_firmware(fw_entry); release_firmware(fw_entry);
go->boot_fw_len = fw_len;
go->boot_fw = bounce;
}
if (go7007_interface_reset(go) < 0 || if (go7007_interface_reset(go) < 0 ||
go7007_send_firmware(go, bounce, fw_len) < 0 || go7007_send_firmware(go, go->boot_fw, go->boot_fw_len) < 0 ||
go7007_read_interrupt(go, &intr_val, &intr_data) < 0 || go7007_read_interrupt(go, &intr_val, &intr_data) < 0 ||
(intr_val & ~0x1) != 0x5a5a) { (intr_val & ~0x1) != 0x5a5a) {
v4l2_err(go, "error transferring firmware\n"); v4l2_err(go, "error transferring firmware\n");
rv = -1; rv = -1;
} }
kfree(bounce);
return rv; return rv;
} }
@ -675,6 +675,7 @@ void go7007_remove(struct go7007 *go)
if (go->audio_enabled) if (go->audio_enabled)
go7007_snd_remove(go); go7007_snd_remove(go);
kfree(go->boot_fw);
go7007_v4l2_remove(go); go7007_v4l2_remove(go);
} }
EXPORT_SYMBOL(go7007_remove); EXPORT_SYMBOL(go7007_remove);

2
drivers/staging/media/go7007/go7007-priv.h
View file

@ -178,6 +178,8 @@ struct go7007 {
int channel_number; /* for multi-channel boards like Adlink PCI-MPG24 */ int channel_number; /* for multi-channel boards like Adlink PCI-MPG24 */
char name[64]; char name[64];
struct video_device *video_dev; struct video_device *video_dev;
void *boot_fw;
unsigned boot_fw_len;
struct v4l2_device v4l2_dev; struct v4l2_device v4l2_dev;
int ref_count; int ref_count;
enum { STATUS_INIT, STATUS_ONLINE, STATUS_SHUTDOWN } status; enum { STATUS_INIT, STATUS_ONLINE, STATUS_SHUTDOWN } status;