Annotation of /trunk/udev/patches/udev-151-fix-missing-firmware-timeout.patch
Parent Directory | Revision Log
Revision 1015 -
(hide annotations)
(download)
Tue Apr 6 23:44:17 2010 UTC (14 years, 5 months ago) by niro
File size: 1065 byte(s)
Tue Apr 6 23:44:17 2010 UTC (14 years, 5 months ago) by niro
File size: 1065 byte(s)
-added firmware timeout patch
1 | niro | 1015 | diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c |
2 | index 8f70be4..16455de 100644 | ||
3 | --- a/extras/firmware/firmware.c | ||
4 | +++ b/extras/firmware/firmware.c | ||
5 | @@ -149,6 +149,7 @@ int main(int argc, char **argv) | ||
6 | |||
7 | util_path_encode(firmware, fwencpath, sizeof(fwencpath)); | ||
8 | util_strscpyl(misspath, sizeof(misspath), udev_get_dev_path(udev), "/.udev/firmware-missing/", fwencpath, NULL); | ||
9 | + util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL); | ||
10 | |||
11 | if (fwfile == NULL) { | ||
12 | int err; | ||
13 | @@ -166,6 +167,7 @@ int main(int argc, char **argv) | ||
14 | udev_selinux_resetfscreatecon(udev); | ||
15 | } while (err == -ENOENT); | ||
16 | rc = 2; | ||
17 | + set_loading(udev, loadpath, "-1"); | ||
18 | goto exit; | ||
19 | } | ||
20 | |||
21 | @@ -176,7 +178,6 @@ int main(int argc, char **argv) | ||
22 | if (unlink(misspath) == 0) | ||
23 | util_delete_path(udev, misspath); | ||
24 | |||
25 | - util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL); | ||
26 | set_loading(udev, loadpath, "1"); | ||
27 | |||
28 | util_strscpyl(datapath, sizeof(datapath), udev_get_sys_path(udev), devpath, "/data", NULL); | ||
29 |