X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=e3f595c9884c0d2fcea42d598ca3321d067069a8;hb=cdf62dce7077a9f9a818edbb67d31d033cbb73c6;hp=d7b9eb56b950b5a1b4772525c86bb944b3a60c6f;hpb=12ab811533406e22b78ce8b227474f1056375ae4;p=ccan

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index d7b9eb56..e3f595c9 100644
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -188,11 +188,6 @@ bool add_duplex(struct io_conn *c)
 
 void backend_del_conn(struct io_conn *conn)
 {
-	if (conn->finish) {
-		/* Saved by io_close */
-		errno = conn->plan.u1.s;
-		conn->finish(conn, conn->finish_arg);
-	}
 	if (timeout_active(conn))
 		backend_del_timeout(conn);
 	io_alloc.free(conn->timeout);
@@ -205,6 +200,11 @@ void backend_del_conn(struct io_conn *conn)
 	} else
 		del_fd(&conn->fd);
 	num_closing--;
+	if (conn->finish) {
+		/* Saved by io_close */
+		errno = conn->plan.u1.s;
+		conn->finish(conn, conn->finish_arg);
+	}
 	free_conn(conn);
 }