浏览代码

Merge branch 'pci/misc' into next

* pci/misc:
  xen-pcifront: Handle backend CLOSED without CLOSING
Bjorn Helgaas 12 年之前
父节点
当前提交
be5cd530bd
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      drivers/pci/xen-pcifront.c

+ 4 - 1
drivers/pci/xen-pcifront.c

@@ -1068,13 +1068,16 @@ static void __init_refok pcifront_backend_changed(struct xenbus_device *xdev,
 	case XenbusStateInitialising:
 	case XenbusStateInitialising:
 	case XenbusStateInitWait:
 	case XenbusStateInitWait:
 	case XenbusStateInitialised:
 	case XenbusStateInitialised:
-	case XenbusStateClosed:
 		break;
 		break;
 
 
 	case XenbusStateConnected:
 	case XenbusStateConnected:
 		pcifront_try_connect(pdev);
 		pcifront_try_connect(pdev);
 		break;
 		break;
 
 
+	case XenbusStateClosed:
+		if (xdev->state == XenbusStateClosed)
+			break;
+		/* Missed the backend's CLOSING state -- fallthrough */
 	case XenbusStateClosing:
 	case XenbusStateClosing:
 		dev_warn(&xdev->dev, "backend going away!\n");
 		dev_warn(&xdev->dev, "backend going away!\n");
 		pcifront_try_disconnect(pdev);
 		pcifront_try_disconnect(pdev);