ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Further cleanup of the logic in device_init.

Browse source 
Change-Id: I96e4b11894926b50792b9b7d7cfa0fe8392abef6
This commit is contained in:
Elliott Hughes 2015-03-28 11:23:32 -07:00
parent 6dbbcc57a0
commit 56a0656ed9
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
init/devices.cpp
View file

@ -992,22 +992,22 @@ void device_init() {
/* is 256K enough? udev uses 16MB! */
device_fd = uevent_open_socket(256*1024, true);
if(device_fd < 0)
if (device_fd == -1) {
return;
}
fcntl(device_fd, F_SETFL, O_NONBLOCK);
struct stat info;
if (stat(COLDBOOT_DONE, &info) < 0) {
Timer t;
coldboot("/sys/class");
coldboot("/sys/block");
coldboot("/sys/devices");
close(open(COLDBOOT_DONE, O_WRONLY|O_CREAT|O_CLOEXEC, 0000));
NOTICE("Coldboot took %.2fs.\n", t.duration());
} else {
if (access(COLDBOOT_DONE, F_OK) == 0) {
NOTICE("Skipping coldboot, already done!\n");
return;
}
Timer t;
coldboot("/sys/class");
coldboot("/sys/block");
coldboot("/sys/devices");
close(open(COLDBOOT_DONE, O_WRONLY|O_CREAT|O_CLOEXEC, 0000));
NOTICE("Coldboot took %.2fs.\n", t.duration());
}
int get_device_fd()