From bb16c70fc95d611a3546fecd2bdefe7e44cf45d0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 18 Aug 2021 10:27:38 +0200 Subject: [PATCH] fix up queue-4.4/pci-msi-enable-and-mask-msi-x-early.patch --- queue-4.4/pci-msi-enable-and-mask-msi-x-early.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/queue-4.4/pci-msi-enable-and-mask-msi-x-early.patch b/queue-4.4/pci-msi-enable-and-mask-msi-x-early.patch index 1e4c15ced11..ed8eecacd97 100644 --- a/queue-4.4/pci-msi-enable-and-mask-msi-x-early.patch +++ b/queue-4.4/pci-msi-enable-and-mask-msi-x-early.patch @@ -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 --- - 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 /* 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; + } -- 2.47.3