forked from len0rd/rockbox
Fixed a dead lock, file handle leak that caused wps to jam and
selected a smaller i2c timeout value. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6707 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
58c71e0e36
commit
ef72f99681
4 changed files with 14 additions and 12 deletions
|
@ -29,6 +29,7 @@
|
|||
#include "file.h"
|
||||
#include "kernel.h"
|
||||
#include "sprintf.h"
|
||||
#include "logf.h"
|
||||
#include "screens.h"
|
||||
#include "misc.h"
|
||||
#include "mas.h"
|
||||
|
@ -374,15 +375,18 @@ int codec_load_file(const char *plugin, void *parameter)
|
|||
fd = open(plugin, O_RDONLY);
|
||||
if (fd < 0) {
|
||||
snprintf(msgbuf, sizeof(msgbuf)-1, "Couldn't load codec: %s", plugin);
|
||||
logf("Codec load error:%d", fd);
|
||||
splash(HZ*2, true, msgbuf);
|
||||
return fd;
|
||||
}
|
||||
|
||||
rc = read(fd, &pluginbuf[0], PLUGIN_BUFFER_SIZE);
|
||||
if (rc <= 0)
|
||||
return PLUGIN_ERROR;
|
||||
plugin_size = rc;
|
||||
close(fd);
|
||||
if (rc <= 0) {
|
||||
logf("Codec read error");
|
||||
return PLUGIN_ERROR;
|
||||
}
|
||||
plugin_size = rc;
|
||||
|
||||
return codec_load_ram(pluginbuf, plugin_size, parameter, NULL, 0);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue