Commit be5cd530 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  xen-pcifront: Handle backend CLOSED without CLOSING
parents 053f328c d5af64de

drivers/pci/xen-pcifront.c

+4 −1
Original line number Diff line number Diff line
@@ -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);