X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=320dffd03c1676d5f401153bb24ed80bb3c21e55;hp=317b4bc320d7e824cf15abb02e632c2bc33fb359;hb=edcfca78ac49793e295ac97328942321f39e3996;hpb=a574a72dcfea1bb61714754eca5612dde3632f0e

diff --git a/discover/udev.c b/discover/udev.c
index 317b4bc..320dffd 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -121,7 +121,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 		if (ddev) {
 			pb_log("SKIP: %s UUID [%s] already present (as %s)\n",
 					name, uuid, ddev->device->id);
-			return -1;
+			return 0;
 		}
 	}
 
@@ -425,12 +425,13 @@ static void udev_log_fn(struct udev __attribute__((unused)) *udev,
       vfprintf(pb_log_get_stream(), format, args);
 }
 
-struct pb_udev *udev_init(struct waitset *waitset,
-	struct device_handler *handler)
+struct pb_udev *udev_init(struct device_handler *handler,
+		struct waitset *waitset)
 {
+	struct pb_udev *udev;
 	int result;
-	struct pb_udev *udev = talloc(NULL, struct pb_udev);
 
+	udev = talloc(handler, struct pb_udev);
 	talloc_set_destructor(udev, udev_destructor);
 	udev->handler = handler;
 
@@ -468,8 +469,3 @@ fail_new:
 	talloc_free(udev);
 	return NULL;
 }
-
-void udev_destroy(struct pb_udev *udev)
-{
-	talloc_free(udev);
-}