diff --git a/[refs] b/[refs]
index 9286090a1b10..a3f8cd75f4a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8c9e788f493d3236809e955c9fc12625a461e09
+refs/heads/master: 0ee46eca0476faf0e93c1387b1597b861b79711f
diff --git a/trunk/drivers/xen/xen-pciback/pciback_ops.c b/trunk/drivers/xen/xen-pciback/pciback_ops.c
index 63616d7453e6..97f5d264c31e 100644
--- a/trunk/drivers/xen/xen-pciback/pciback_ops.c
+++ b/trunk/drivers/xen/xen-pciback/pciback_ops.c
@@ -234,7 +234,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
 	if (dev_data)
 		dev_data->ack_intr = 0;
 
-	return result;
+	return result > 0 ? 0 : result;
 }
 
 static