]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up queue-4.4/pci-msi-enable-and-mask-msi-x-early.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Aug 2021 08:27:38 +0000 (10:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Aug 2021 08:27:38 +0000 (10:27 +0200)
queue-4.4/pci-msi-enable-and-mask-msi-x-early.patch

index 1e4c15ced11075fe5f7fd3e179788dbb667b5795..ed8eecacd970ea543f211c96f4577c7fbe43fd01 100644 (file)
@@ -43,8 +43,8 @@ Cc: stable@vger.kernel.org
 Link: https://lore.kernel.org/r/20210729222542.344136412@linutronix.de
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/pci/msi.c |   26 ++++++++++++++------------
- 1 file changed, 14 insertions(+), 12 deletions(-)
+ drivers/pci/msi.c |   28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
 
 --- a/drivers/pci/msi.c
 +++ b/drivers/pci/msi.c
@@ -66,8 +66,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        /* Request & Map MSI-X table region */
        base = msix_map_region(dev, msix_table_size(control));
 -      if (!base)
+-              return -ENOMEM;
 +      if (!base) {
-               return -ENOMEM;
++              ret = -ENOMEM;
 +              goto out_disable;
 +      }