X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fpbt-client.c;h=dfbe9552c32bca48a8c4f33700249896dd755c5e;hp=ad418a32e2e95941c9d7186471890f070da3f815;hb=9939af2652ce479645eaa78e891ee06f33845a99;hpb=69c459db80abece18b5557d9b8a8098a88329c28

diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c
index ad418a3..dfbe955 100644
--- a/ui/twin/pbt-client.c
+++ b/ui/twin/pbt-client.c
@@ -298,7 +298,8 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend,
 retry_start:
 	for (i = start_deamon ? 2 : 10; i; i--) {
 		pbt_client->discover_client
-			= discover_client_init(&pbt_client_ops, pbt_client);
+			= discover_client_init(pbt_client->waitset,
+					&pbt_client_ops, pbt_client);
 		if (pbt_client->discover_client || !i)
 			break;
 		pb_log("%s: waiting for server %d\n", __func__, i);
@@ -332,11 +333,6 @@ retry_start:
 		goto fail_client_init;
 	}
 
-	waiter_register(pbt_client->waitset,
-			discover_client_get_fd(pbt_client->discover_client),
-			WAIT_IN, (waiter_cb)discover_client_process,
-			pbt_client->discover_client);
-
 	return pbt_client;
 
 fail_client_init: