diff for duplicates of <5201FCA4.30804@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 0c6d291..58ab550 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -120,16 +120,16 @@ index f0ae684..0000000 @@ -1,3 +0,0 @@ -# do not edit this file, it will be overwritten on update - --SUBSYSTEM="firmware", ACTION="add", RUN{builtin}="firmware" +-SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware" diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules index f764789..645830e 100644 --- a/rules/50-udev-default.rules +++ b/rules/50-udev-default.rules -@@ -8,6 +8,7 @@ SUBSYSTEM="rtc", KERNEL="rtc0", SYMLINK+="rtc", OPTIONS+="link_priority=-100" +@@ -8,6 +8,7 @@ SUBSYSTEM=="rtc", KERNEL=="rtc0", SYMLINK+="rtc", OPTIONS+="link_priority=-100" - SUBSYSTEM="usb", ENV{DEVTYPE}="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" - SUBSYSTEM="input", ENV{ID_INPUT}="", IMPORT{builtin}="input_id" -+SUBSYSTEM="firmware", ACTION="add", IMPORT{builtin}="firmware" + SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" + SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" ++SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware" ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" ACTION!="add", GOTO="default_permissions_end" @@ -162,7 +162,7 @@ index b80940b..e678545 100644 @@ -112,7 +112,10 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo strscpyl(loadpath, sizeof(loadpath), udev_device_get_syspath(dev), "/loading", NULL); - if (fwfile = NULL) { + if (fwfile == NULL) { - log_debug("did not find firmware file '%s'\n", firmware); + if (ELEMENTSOF(searchpath)) + log_debug("did not find firmware file '%s'\n", firmware); @@ -245,4 +245,4 @@ index 45ec3d6..e27a33a 100644 -#endif /* parent device event found */ - if (event->devpath[common] = '/') { + if (event->devpath[common] == '/') { diff --git a/a/content_digest b/N1/content_digest index ad31ed2..bd14c39 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,7 +8,7 @@ "ref\0CALCETrU-CWuefE5XUpC=xFuCXaL56Cox95nL35Bm9jMi_B+6_A@mail.gmail.com\0" "From\0Maarten Lankhorst <m.b.lankhorst@gmail.com>\0" "Subject\0[PATCH] udev: fail firmware loading immediately if no search path is defined\0" - "Date\0Wed, 07 Aug 2013 07:52:04 +0000\0" + "Date\0Wed, 07 Aug 2013 09:52:04 +0200\0" "To\0Andy Lutomirski <luto@amacapital.net>\0" "Cc\0Tom Gundersen <teg@jklm.no>" Bryan Kadzban <bryan@kadzban.is-a-geek.net> @@ -143,16 +143,16 @@ "@@ -1,3 +0,0 @@\n" "-# do not edit this file, it will be overwritten on update\n" "-\n" - "-SUBSYSTEM=\"firmware\", ACTION=\"add\", RUN{builtin}=\"firmware\"\n" + "-SUBSYSTEM==\"firmware\", ACTION==\"add\", RUN{builtin}=\"firmware\"\n" "diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules\n" "index f764789..645830e 100644\n" "--- a/rules/50-udev-default.rules\n" "+++ b/rules/50-udev-default.rules\n" - "@@ -8,6 +8,7 @@ SUBSYSTEM=\"rtc\", KERNEL=\"rtc0\", SYMLINK+=\"rtc\", OPTIONS+=\"link_priority=-100\"\n" + "@@ -8,6 +8,7 @@ SUBSYSTEM==\"rtc\", KERNEL==\"rtc0\", SYMLINK+=\"rtc\", OPTIONS+=\"link_priority=-100\"\n" " \n" - " SUBSYSTEM=\"usb\", ENV{DEVTYPE}=\"usb_device\", IMPORT{builtin}=\"usb_id\", IMPORT{builtin}=\"hwdb --subsystem=usb\"\n" - " SUBSYSTEM=\"input\", ENV{ID_INPUT}=\"\", IMPORT{builtin}=\"input_id\"\n" - "+SUBSYSTEM=\"firmware\", ACTION=\"add\", IMPORT{builtin}=\"firmware\"\n" + " SUBSYSTEM==\"usb\", ENV{DEVTYPE}==\"usb_device\", IMPORT{builtin}=\"usb_id\", IMPORT{builtin}=\"hwdb --subsystem=usb\"\n" + " SUBSYSTEM==\"input\", ENV{ID_INPUT}==\"\", IMPORT{builtin}=\"input_id\"\n" + "+SUBSYSTEM==\"firmware\", ACTION==\"add\", IMPORT{builtin}=\"firmware\"\n" " ENV{MODALIAS}!=\"\", IMPORT{builtin}=\"hwdb --subsystem=$env{SUBSYSTEM}\"\n" " \n" " ACTION!=\"add\", GOTO=\"default_permissions_end\"\n" @@ -185,7 +185,7 @@ "@@ -112,7 +112,10 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo\n" " strscpyl(loadpath, sizeof(loadpath), udev_device_get_syspath(dev), \"/loading\", NULL);\n" " \n" - " if (fwfile = NULL) {\n" + " if (fwfile == NULL) {\n" "- log_debug(\"did not find firmware file '%s'\\n\", firmware);\n" "+ if (ELEMENTSOF(searchpath))\n" "+ log_debug(\"did not find firmware file '%s'\\n\", firmware);\n" @@ -268,6 +268,6 @@ "-#endif\n" " \n" " /* parent device event found */\n" - if (event->devpath[common] = '/') { + if (event->devpath[common] == '/') { -8a3fc550af42a745658482a57220d5f7f74207a3a41fcb5cf3c05312b3ef349f +892bc93c5d941ea5df11802db2994b7efe1af09863f7259411dac7c000eb67be
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.