diff for duplicates of <20180306182128.23281-3-decui@microsoft.com> diff --git a/a/1.txt b/N1/1.txt index ccf292f..c1d2e13 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,18 +16,17 @@ diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c index 1233300f41c6..04edb24c92ee 100644 --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c -@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct = -*work) -=20 - hpdev =3D container_of(work, struct hv_pci_dev, wrk); -=20 -- if (hpdev->state !=3D hv_pcichild_ejecting) { +@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct *work) + + hpdev = container_of(work, struct hv_pci_dev, wrk); + +- if (hpdev->state != hv_pcichild_ejecting) { - put_pcichild(hpdev, hv_pcidev_ref_pnp); - return; - } -+ WARN_ON(hpdev->state !=3D hv_pcichild_ejecting); -=20 ++ WARN_ON(hpdev->state != hv_pcichild_ejecting); + /* * Ejection can come before or after the PCI bus has been set up, so ---=20 +-- 2.7.4 diff --git a/a/content_digest b/N1/content_digest index 47d5c35..69c6640 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -38,20 +38,19 @@ "index 1233300f41c6..04edb24c92ee 100644\n" "--- a/drivers/pci/host/pci-hyperv.c\n" "+++ b/drivers/pci/host/pci-hyperv.c\n" - "@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct =\n" - "*work)\n" - "=20\n" - " \thpdev =3D container_of(work, struct hv_pci_dev, wrk);\n" - "=20\n" - "-\tif (hpdev->state !=3D hv_pcichild_ejecting) {\n" + "@@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct *work)\n" + " \n" + " \thpdev = container_of(work, struct hv_pci_dev, wrk);\n" + " \n" + "-\tif (hpdev->state != hv_pcichild_ejecting) {\n" "-\t\tput_pcichild(hpdev, hv_pcidev_ref_pnp);\n" "-\t\treturn;\n" "-\t}\n" - "+\tWARN_ON(hpdev->state !=3D hv_pcichild_ejecting);\n" - "=20\n" + "+\tWARN_ON(hpdev->state != hv_pcichild_ejecting);\n" + " \n" " \t/*\n" " \t * Ejection can come before or after the PCI bus has been set up, so\n" - "--=20\n" + "-- \n" 2.7.4 -a0386c6ca3b883430e731f430564c3835614a4960b26117f9760884aa8b506ff +5334f5dc68ba4225ef320b5f11691193c52f1929a3d086c2bedb830f89ab01fa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.