diff --git a/[refs] b/[refs]
index 9ee64e5d9da6..90a47b9a1fe8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3762bfc8d046342db664d855f8f875e8a4c2ca1
+refs/heads/master: e578e9a1cc8a5983d87126d5877e305d3189f1b9
diff --git a/trunk/drivers/message/i2o/driver.c b/trunk/drivers/message/i2o/driver.c
index d3235f213c89..d330e4eb86ac 100644
--- a/trunk/drivers/message/i2o/driver.c
+++ b/trunk/drivers/message/i2o/driver.c
@@ -123,8 +123,12 @@ int i2o_driver_register(struct i2o_driver *drv)
 	}
 
 	rc = driver_register(&drv->driver);
-	if (rc)
-		destroy_workqueue(drv->event_queue);
+	if (rc) {
+		if (drv->event) {
+			destroy_workqueue(drv->event_queue);
+			drv->event_queue = NULL;
+		}
+	}
 
 	return rc;
 };