diff options
| author | Brian Swetland <swetland@google.com> | 2010-09-19 04:35:19 -0700 |
|---|---|---|
| committer | Brian Swetland <swetland@google.com> | 2010-09-19 04:35:19 -0700 |
| commit | d06df51bcd7bcc2656089a529fa6a455bad00d37 (patch) | |
| tree | 66f3896bd96c96669c9b2914186cd5d67cf9de8e /init | |
| parent | 1f7bc6d1a94d36547a7f5bbd5e039fffc37e9629 (diff) | |
| parent | 3b5214a67f43e2e4f69428e98d3a2c130c7c87d8 (diff) | |
| download | system_core-d06df51bcd7bcc2656089a529fa6a455bad00d37.zip system_core-d06df51bcd7bcc2656089a529fa6a455bad00d37.tar.gz system_core-d06df51bcd7bcc2656089a529fa6a455bad00d37.tar.bz2 | |
resolved conflicts for merge of 3b5214a6 to master
Change-Id: Id73c53c6c2e9c21eb9b1d1e624aaeb25097ea7a4
Diffstat (limited to 'init')
| -rw-r--r-- | init/devices.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/init/devices.c b/init/devices.c index 5a580fa..595f968 100644 --- a/init/devices.c +++ b/init/devices.c @@ -39,7 +39,8 @@ #include "list.h" #define SYSFS_PREFIX "/sys" -#define FIRMWARE_DIR "/etc/firmware" +#define FIRMWARE_DIR1 "/etc/firmware" +#define FIRMWARE_DIR2 "/vendor/firmware" static int device_fd = -1; @@ -532,7 +533,7 @@ out: static void process_firmware_event(struct uevent *uevent) { - char *root, *loading, *data, *file; + char *root, *loading, *data, *file1 = NULL, *file2 = NULL; int l, loading_fd, data_fd, fw_fd; log_event_print("firmware event { '%s', '%s' }\n", @@ -550,7 +551,11 @@ static void process_firmware_event(struct uevent *uevent) if (l == -1) goto loading_free_out; - l = asprintf(&file, FIRMWARE_DIR"/%s", uevent->firmware); + l = asprintf(&file1, FIRMWARE_DIR1"/%s", uevent->firmware); + if (l == -1) + goto data_free_out; + + l = asprintf(&file2, FIRMWARE_DIR2"/%s", uevent->firmware); if (l == -1) goto data_free_out; @@ -562,14 +567,17 @@ static void process_firmware_event(struct uevent *uevent) if(data_fd < 0) goto loading_close_out; - fw_fd = open(file, O_RDONLY); - if(fw_fd < 0) - goto data_close_out; + fw_fd = open(file1, O_RDONLY); + if(fw_fd < 0) { + fw_fd = open(file2, O_RDONLY); + if(fw_fd < 0) + goto data_close_out; + } if(!load_firmware(fw_fd, loading_fd, data_fd)) - log_event_print("firmware copy success { '%s', '%s' }\n", root, file); + log_event_print("firmware copy success { '%s', '%s' }\n", root, uevent->firmware); else - log_event_print("firmware copy failure { '%s', '%s' }\n", root, file); + log_event_print("firmware copy failure { '%s', '%s' }\n", root, uevent->firmware); close(fw_fd); data_close_out: @@ -577,7 +585,8 @@ data_close_out: loading_close_out: close(loading_fd); file_free_out: - free(file); + free(file1); + free(file2); data_free_out: free(data); loading_free_out: |