let NAME="" supress node creation, but do RUN keys

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

diff --git a/udev_event.c b/udev_event.c
index fae5a465972bcf6ad7ab63c30a232b48b3bef123..b50fbf4c1dd61df4f0fcf8cceeb74975bfa22651 100644 (file)
--- a/udev_event.c
+++ b/udev_event.c
@@ -73,13 +73,12 @@ int udev_process_event(struct udev_rules *rules, struct udevice *udev)
                                        sysfs_close_class_device(class_dev);
                                        return -1;
                                }
                                        sysfs_close_class_device(class_dev);
                                        return -1;
                                }

-                               if (udev->name[0] == '\0') {
+                               if (udev->name[0] != '\0') {
+                                       /* create node, store in db */
+                                       retval = udev_add_device(udev, class_dev);
+                               } else {

                                        info("device node creation supressed");
                                        info("device node creation supressed");

-                                       sysfs_close_class_device(class_dev);
-                                       return -1;

                                }
                                }

-                               /* create node, store in db */
-                               retval = udev_add_device(udev, class_dev);

                        } else {
                                dbg("no dev-file found");
                                udev_rules_get_run(rules, udev, class_dev, NULL);
                        } else {
                                dbg("no dev-file found");
                                udev_rules_get_run(rules, udev, class_dev, NULL);

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 6e978d74b4f17a3c26c7132b8ff117d102af4947..9041c383e0576c0874eb4c65c1486b118a53565a 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -413,12 +413,9 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                                        rule->ignore_remove = 1;
                                }
                        }
                                        rule->ignore_remove = 1;
                                }
                        }

-                       if (value[0] == '\0') {
-                               dbg("name empty device should be ignored");
-                               rule->name.operation = operation;
-                               rule->ignore_device = 1;
-                       } else
-                               add_rule_key(rule, &rule->name, operation, value);
+                       if (value[0] == '\0')
+                               dbg("name empty, not creation supressed");
+                       add_rule_key(rule, &rule->name, operation, value);

                        continue;
                }
 
                        continue;
                }