---

yaml --- r: 264464 b: refs/heads/master c: 12e13ac h: refs/heads/master v: v3
git-mirror · Aug 26, 2011 · 3b865bc · 3b865bc
1 parent c83c7ea
commit 3b865bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61ca79831ce52c23b3a130f3c2351751e00e0ac9
+refs/heads/master: 12e13ac84ca70e6641a4750e9317aa2d2c1f6f50
diff --git a/trunk/drivers/xen/pci.c b/trunk/drivers/xen/pci.c
@@ -96,13 +96,16 @@ static int xen_pci_notifier(struct notifier_block *nb,
 		r = xen_remove_device(dev);
 		break;
 	default:
-		break;
+		return NOTIFY_DONE;
 	}
-
-	return r;
+	if (r)
+		dev_err(dev, "Failed to %s - passthrough or MSI/MSI-X might fail!\n",
+			action == BUS_NOTIFY_ADD_DEVICE ? "add" :
+			(action == BUS_NOTIFY_DEL_DEVICE ? "delete" : "?"));
+	return NOTIFY_OK;
 }
 
-struct notifier_block device_nb = {
+static struct notifier_block device_nb = {
 	.notifier_call = xen_pci_notifier,
 };