From 76391441eebe1bfebddb772419d2ba63ecc913d0 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@nokia.com>
Date: Mon, 25 Sep 2006 15:25:37 +0000
Subject: Fix HUP or ERR checking

---
 hcid/dbus-adapter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c
index c7f11d5b..4312c284 100644
--- a/hcid/dbus-adapter.c
+++ b/hcid/dbus-adapter.c
@@ -1808,7 +1808,7 @@ static gboolean create_bonding_conn_complete(GIOChannel *io, GIOCondition cond,
 		goto cleanup;
 	}
 
-	if (cond & G_IO_HUP & G_IO_ERR) {
+	if (cond & (G_IO_HUP | G_IO_ERR)) {
 		debug("Hangup or error on bonding IO channel");
 		error_failed(pdata->bonding->conn, pdata->bonding->rq, EIO);
 		goto failed;
-- 
cgit