diff for duplicates of <537DC991.9010401@suse.de> diff --git a/a/1.txt b/N1/1.txt index 220a8ef..15f40e1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -594,7 +594,7 @@ So would it make sense to combine this with the reset call? > if (!try_module_get(THIS_MODULE)) > return -ENODEV; > -> if (atomic_inc_return(&vdev->refcnt) = 1) { +> if (atomic_inc_return(&vdev->refcnt) == 1) { > - int ret = vfio_pci_enable(vdev); > - if (ret) { > - module_put(THIS_MODULE); @@ -712,11 +712,11 @@ So would it make sense to combine this with the reset call? > > kfree(groups); > return ret; -> + } else if (cmd = VFIO_EEH_PE_SET_OPTION || -> + cmd = VFIO_EEH_PE_GET_ADDR || -> + cmd = VFIO_EEH_PE_GET_STATE || -> + cmd = VFIO_EEH_PE_RESET || -> + cmd = VFIO_EEH_PE_CONFIGURE) { +> + } else if (cmd == VFIO_EEH_PE_SET_OPTION || +> + cmd == VFIO_EEH_PE_GET_ADDR || +> + cmd == VFIO_EEH_PE_GET_STATE || +> + cmd == VFIO_EEH_PE_RESET || +> + cmd == VFIO_EEH_PE_CONFIGURE) { > + return vfio_eeh_pci_ioctl(vdev->pdev, cmd, arg); > } > diff --git a/a/content_digest b/N1/content_digest index 931c74f..b4a8146 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01400747034-15045-3-git-send-email-gwshan@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v6 2/3] drivers/vfio: EEH support for VFIO PCI device\0" - "Date\0Thu, 22 May 2014 09:55:29 +0000\0" + "Date\0Thu, 22 May 2014 11:55:29 +0200\0" "To\0Gavin Shan <gwshan@linux.vnet.ibm.com>" " kvm-ppc@vger.kernel.org\0" "Cc\0aik@ozlabs.ru" @@ -607,7 +607,7 @@ "> \tif (!try_module_get(THIS_MODULE))\n" "> \t\treturn -ENODEV;\n" "> \n" - "> \tif (atomic_inc_return(&vdev->refcnt) = 1) {\n" + "> \tif (atomic_inc_return(&vdev->refcnt) == 1) {\n" "> -\t\tint ret = vfio_pci_enable(vdev);\n" "> -\t\tif (ret) {\n" "> -\t\t\tmodule_put(THIS_MODULE);\n" @@ -725,11 +725,11 @@ "> \n" "> \t\tkfree(groups);\n" "> \t\treturn ret;\n" - "> +\t} else if (cmd = VFIO_EEH_PE_SET_OPTION ||\n" - "> +\t\t cmd = VFIO_EEH_PE_GET_ADDR ||\n" - "> +\t\t cmd = VFIO_EEH_PE_GET_STATE ||\n" - "> +\t\t cmd = VFIO_EEH_PE_RESET ||\n" - "> +\t\t cmd = VFIO_EEH_PE_CONFIGURE) {\n" + "> +\t} else if (cmd == VFIO_EEH_PE_SET_OPTION ||\n" + "> +\t\t cmd == VFIO_EEH_PE_GET_ADDR ||\n" + "> +\t\t cmd == VFIO_EEH_PE_GET_STATE ||\n" + "> +\t\t cmd == VFIO_EEH_PE_RESET ||\n" + "> +\t\t cmd == VFIO_EEH_PE_CONFIGURE) {\n" "> +\t\t\treturn vfio_eeh_pci_ioctl(vdev->pdev, cmd, arg);\n" "> \t}\n" "> \n" @@ -817,4 +817,4 @@ "> \n" > #endif /* _UAPIVFIO_H */ -47eacb43ff853942679ba927ed005304a29f81301f50422cff81b4c681d31653 +366591eebf3c0816eebd9aa05b684d500111258a84bdb67dfc692429c6e4690e
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.