X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=6ccb8d4ba42917aed8669cf4e78bff03cc500a6e;hp=9e1a5ce8a5155294efe33b5ee817853c3c57fc43;hb=cd94ab94766ae863467195324fb84b3d020c96cf;hpb=ae3c354e844698bdb4ed35a6845aa9dca1e9205f

diff --git a/discover/udev.c b/discover/udev.c
index 9e1a5ce..6ccb8d4 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -41,11 +41,15 @@ static int udev_destructor(void *p)
 {
 	struct pb_udev *udev = p;
 
-	udev_monitor_unref(udev->monitor);
-	udev->monitor = NULL;
+	if (udev->monitor) {
+		udev_monitor_unref(udev->monitor);
+		udev->monitor = NULL;
+	}
 
-	udev_unref(udev->udev);
-	udev->udev = NULL;
+	if (udev->udev) {
+		udev_unref(udev->udev);
+		udev->udev = NULL;
+	}
 
 	return 0;
 }
@@ -317,11 +321,6 @@ static int udev_enumerate(struct udev *udev)
 
 	list = udev_enumerate_get_list_entry(enumerate);
 
-	if (!list) {
-		pb_log("udev_enumerate_get_list_entry failed\n");
-		goto fail;
-	}
-
 	udev_list_entry_foreach(entry, list) {
 		const char *syspath;
 		struct udev_device *dev;
@@ -426,7 +425,7 @@ struct pb_udev *udev_init(struct device_handler *handler,
 	struct pb_udev *udev;
 	int result;
 
-	udev = talloc(handler, struct pb_udev);
+	udev = talloc_zero(handler, struct pb_udev);
 	talloc_set_destructor(udev, udev_destructor);
 	udev->handler = handler;
 
@@ -434,7 +433,7 @@ struct pb_udev *udev_init(struct device_handler *handler,
 
 	if (!udev->udev) {
 		pb_log("udev_new failed\n");
-		goto fail_new;
+		goto fail;
 	}
 
 	udev_set_userdata(udev->udev, udev);
@@ -443,11 +442,11 @@ struct pb_udev *udev_init(struct device_handler *handler,
 
 	result = udev_setup_monitor(udev->udev, &udev->monitor);
 	if (result)
-		goto fail_monitor;
+		goto fail;
 
 	result = udev_enumerate(udev->udev);
 	if (result)
-		goto fail_enumerate;
+		goto fail;
 
 	waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
 		udev_process, udev->monitor);
@@ -456,11 +455,7 @@ struct pb_udev *udev_init(struct device_handler *handler,
 
 	return udev;
 
-fail_monitor:
-	udev_monitor_unref(udev->monitor);
-fail_enumerate:
-	udev_unref(udev->udev);
-fail_new:
+fail:
 	talloc_free(udev);
 	return NULL;
 }