X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_sysfs.c;h=1b3603df6d0d018b815bf4488e58f3a2e3890811;hb=5178355672901e2514e69cd0264f95ba155b8aba;hp=a4f293ef1395a6ee622d7845d1335dbd7de29635;hpb=5ce120d366b54ea2bae12ec6ce01bb0d38ff1f50;p=elogind.git

diff --git a/udev_sysfs.c b/udev_sysfs.c
index a4f293ef1..1b3603df6 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -54,6 +54,8 @@ static const struct subsystem_file {
 	{ .subsystem = "ieee1394_node",	.file = NULL },
 	{ .subsystem = "fc_transport",	.file = "port_id" },
 	{ .subsystem = "fc_host",	.file = "port_id" },
+	{ .subsystem = "spi_transport",	.file = "width" },
+	{ .subsystem = "spi_host",	.file = "width" },
 	{ NULL, NULL }
 };
 
@@ -379,7 +381,7 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
 
 struct sysfs_class_device *wait_class_device_open(const char *path)
 {
-	struct sysfs_class_device *class_dev;
+	struct sysfs_class_device *class_dev = NULL;
 	int loop;
 
 	loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
@@ -391,7 +393,7 @@ struct sysfs_class_device *wait_class_device_open(const char *path)
 		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
 	}
 
-	return (class_dev);
+	return class_dev;
 }
 
 int wait_for_class_device(struct sysfs_class_device *class_dev,
@@ -448,7 +450,7 @@ int wait_for_class_device(struct sysfs_class_device *class_dev,
 
 struct sysfs_device *wait_devices_device_open(const char *path)
 {
-	struct sysfs_device *devices_dev;
+	struct sysfs_device *devices_dev = NULL;
 	int loop;
 
 	loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
@@ -460,5 +462,5 @@ struct sysfs_device *wait_devices_device_open(const char *path)
 		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
 	}
 
-	return(devices_dev);
+	return devices_dev;
 }