[PATCH] add debug line for REPLACE call.

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 6ed2415cdd6fef71d3e7ba6ee33066a1d9c1b766..c277cec28f4b28e6ee80517a128a4528d3cfd9dd 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -22,7 +22,7 @@
  */
 
 /* define this to enable parsing debugging */
-#define DEBUG_PARSER
+/* #define DEBUG_PARSER */
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -527,10 +527,12 @@ static int exec_callout(struct config_device *dev, char *value, int len)
                        retval = -1;
                }
 
+#ifndef __KLIBC__
                if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
                        dbg("callout program status 0x%x", status);
                        retval = -1;
                }
+#endif
        }
        return retval;
 }
@@ -566,7 +568,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 
                        /* look in the class device directory if present */
                        if (class_dev->sysdevice) {
-                               tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
+                               tmpattr = sysfs_get_device_attr(class_dev->sysdevice, dev->sysfs_file);
                                if (tmpattr)
                                        goto label_found;
                        }
@@ -599,7 +601,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 
                                        /* look in the class device directory if present */
                                        if (class_dev_parent->sysdevice) {
-                                               tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file);
+                                               tmpattr = sysfs_get_device_attr(class_dev_parent->sysdevice, dev->sysfs_file);
                                                if (tmpattr) 
                                                        goto label_found;
                                        }
@@ -731,6 +733,8 @@ label_found:
                        break;
                        }
                case REPLACE:
+                       dbg_parse("REPLACE: replace name '%s' with '%s'",
+                                 dev->kernel_name, dev->name);
                        if (strcmp(dev->kernel_name, class_dev->name) != 0)
                                continue;
                        strcpy(udev->name, dev->name);