summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/udev/gentoo/udev.rules4
-rw-r--r--udevinfo.c13
2 files changed, 7 insertions, 10 deletions
diff --git a/etc/udev/gentoo/udev.rules b/etc/udev/gentoo/udev.rules
index db8c5d9263..65113aebf7 100644
--- a/etc/udev/gentoo/udev.rules
+++ b/etc/udev/gentoo/udev.rules
@@ -51,8 +51,8 @@ KERNEL="timer", NAME="snd/%k"
KERNEL="seq", NAME="snd/%k"
# capi devices
-KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20"
-KERNEL="capi*", NAME="capi/%n"
+KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20", GROUP="dialout"
+KERNEL="capi*", NAME="capi/%n", GROUP="dialout"
# cpu devices
KERNEL="cpu[0-9]*", NAME="cpu/%n/cpuid"
diff --git a/udevinfo.c b/udevinfo.c
index 31e719fe35..69e5335b7c 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -152,19 +152,16 @@ static int print_device_chain(const char *path)
/* look the device chain upwards */
while (sysfs_dev != NULL) {
- attr_list = sysfs_get_device_attributes(sysfs_dev);
- if (attr_list == NULL) {
- fprintf(stderr, "couldn't open device directory\n");
- retval = -1;
- goto exit;
- }
-
printf(" looking at the device chain at '%s':\n", sysfs_dev->path);
printf(" BUS==\"%s\"\n", sysfs_dev->bus);
printf(" ID==\"%s\"\n", sysfs_dev->bus_id);
printf(" DRIVER==\"%s\"\n", sysfs_dev->driver_name);
- print_all_attributes(attr_list);
+ attr_list = sysfs_get_device_attributes(sysfs_dev);
+ if (attr_list != NULL)
+ print_all_attributes(attr_list);
+ else
+ printf("\n");
sysfs_dev = sysfs_get_device_parent(sysfs_dev);
if (sysfs_dev == NULL)