summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-12-01 01:37:44 +0400
committerBjorn Helgaas <bhelgaas@google.com>2012-12-01 01:37:44 +0400
commitbe5cd530bd23ef3e00dcb4998e151de9fdd1a104 (patch)
tree4371f337fa0679890787893da5e084172130f259 /drivers/pci
parent053f328c93a3fc9713abfa7060454438407e94a7 (diff)
parentd5af64de2d1cc87d77ac7c0e90d89630a37a4f09 (diff)
downloadlinux-be5cd530bd23ef3e00dcb4998e151de9fdd1a104.tar.xz
Merge branch 'pci/misc' into next
* pci/misc: xen-pcifront: Handle backend CLOSED without CLOSING
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/xen-pcifront.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 0aab85a51559..a0c73120b262 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -1068,13 +1068,16 @@ static void __init_refok pcifront_backend_changed(struct xenbus_device *xdev,
case XenbusStateInitialising:
case XenbusStateInitWait:
case XenbusStateInitialised:
- case XenbusStateClosed:
break;
case XenbusStateConnected:
pcifront_try_connect(pdev);
break;
+ case XenbusStateClosed:
+ if (xdev->state == XenbusStateClosed)
+ break;
+ /* Missed the backend's CLOSING state -- fallthrough */
case XenbusStateClosing:
dev_warn(&xdev->dev, "backend going away!\n");
pcifront_try_disconnect(pdev);