chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] get 'make release' to work properly again.
[elogind.git]
/
namedev.c
diff --git
a/namedev.c
b/namedev.c
index 6ed2415cdd6fef71d3e7ba6ee33066a1d9c1b766..99542dc4d668a1216eb92e5f2ee7ee6cbfd1e718 100644
(file)
--- a/
namedev.c
+++ b/
namedev.c
@@
-22,7
+22,7
@@
*/
/* define this to enable parsing debugging */
*/
/* define this to enable parsing debugging */
-#define DEBUG_PARSER
+/* #define DEBUG_PARSER */
#include <stddef.h>
#include <stdlib.h>
#include <stddef.h>
#include <stdlib.h>
@@
-527,10
+527,12
@@
static int exec_callout(struct config_device *dev, char *value, int len)
retval = -1;
}
retval = -1;
}
+#ifndef __KLIBC__
if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
dbg("callout program status 0x%x", status);
retval = -1;
}
if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
dbg("callout program status 0x%x", status);
retval = -1;
}
+#endif
}
return retval;
}
}
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) {
/* 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;
}
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) {
/* 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;
}
if (tmpattr)
goto label_found;
}