From: Greg Kroah-Hartman Date: Wed, 18 Aug 2021 08:35:08 +0000 (+0200) Subject: fix up queue-4.9/pci-msi-enable-and-mask-msi-x-early.patch X-Git-Tag: v5.13.13~52 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=573994f66d63b2905c5d67c65bbc97b2069eb5c2;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-4.9/pci-msi-enable-and-mask-msi-x-early.patch --- diff --git a/queue-4.9/pci-msi-enable-and-mask-msi-x-early.patch b/queue-4.9/pci-msi-enable-and-mask-msi-x-early.patch index 55e10e87ada..0fff0eec2b5 100644 --- a/queue-4.9/pci-msi-enable-and-mask-msi-x-early.patch +++ b/queue-4.9/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; + }