diff --git a/[refs] b/[refs] index 3eaf2180e6e3..4986f98299a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fbdc10395cd500d6ff844825a918c4e6f38de37 +refs/heads/master: 72bf809a19d9fc97bfe39bb928149b5e0f202cb6 diff --git a/trunk/drivers/xen/xen-pciback/pci_stub.c b/trunk/drivers/xen/xen-pciback/pci_stub.c index 1b474804180a..3cc3fbe5bf8d 100644 --- a/trunk/drivers/xen/xen-pciback/pci_stub.c +++ b/trunk/drivers/xen/xen-pciback/pci_stub.c @@ -512,12 +512,7 @@ static void kill_domain_by_device(struct pcistub_device *psdev) int err; char nodename[PCI_NODENAME_MAX]; - if (!psdev) { - dev_err(&psdev->dev->dev, - "device is NULL when do AER recovery/kill_domain\n"); - return; - } - + BUG_ON(!psdev); snprintf(nodename, PCI_NODENAME_MAX, "/local/domain/0/backend/pci/%d/0", psdev->pdev->xdev->otherend_id);