diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-30 14:37:44 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-30 14:37:44 -0700 |
| commit | be5cd530bd23ef3e00dcb4998e151de9fdd1a104 (patch) | |
| tree | 4371f337fa0679890787893da5e084172130f259 | |
| parent | 053f328c93a3fc9713abfa7060454438407e94a7 (diff) | |
| parent | d5af64de2d1cc87d77ac7c0e90d89630a37a4f09 (diff) | |
| download | olio-linux-3.10-be5cd530bd23ef3e00dcb4998e151de9fdd1a104.tar.xz olio-linux-3.10-be5cd530bd23ef3e00dcb4998e151de9fdd1a104.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
xen-pcifront: Handle backend CLOSED without CLOSING
| -rw-r--r-- | drivers/pci/xen-pcifront.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 0aab85a5155..a0c73120b26 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); |