diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 15:39:06 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 15:39:06 -0400 |
| commit | 770bfb499dc424d7b48660cb7139248955098d3c (patch) | |
| tree | 9e5e2db4fe70f79e6bada0f620455f7d30cb04c6 | |
| parent | 1c845d45ea97c2411eb7bf2318618a67cef08f88 (diff) | |
| download | longterm-queue-4.12-770bfb499dc424d7b48660cb7139248955098d3c.tar.gz | |
misc: context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/misc-pci_endpoint_test-Fix-failure-path-return-value.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/misc-pci_endpoint_test-Fix-failure-path-return-value.patch b/queue/misc-pci_endpoint_test-Fix-failure-path-return-value.patch index 5dbb87b..a6561a5 100644 --- a/queue/misc-pci_endpoint_test-Fix-failure-path-return-value.patch +++ b/queue/misc-pci_endpoint_test-Fix-failure-path-return-value.patch @@ -1,4 +1,4 @@ -From 80068c93688f6143100859c4856f895801c1a1d9 Mon Sep 17 00:00:00 2001 +From 90b760c1db6113027dec110f766b7e381440469e Mon Sep 17 00:00:00 2001 From: Kishon Vijay Abraham I <kishon@ti.com> Date: Wed, 11 Oct 2017 14:14:36 +0530 Subject: [PATCH] misc: pci_endpoint_test: Fix failure path return values in @@ -11,20 +11,21 @@ failure cases. Fix it here. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c -index d40a34f594c7..5e7af21686d6 100644 +index 09c10f426b64..e26a8c28bcf7 100644 --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c -@@ -542,6 +542,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, +@@ -448,6 +448,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, - test->base = test->bar[test_reg_bar]; + test->base = test->bar[0]; if (!test->base) { + err = -ENOMEM; - dev_err(dev, "Cannot perform PCI test without BAR%d\n", - test_reg_bar); + dev_err(dev, "Cannot perform PCI test without BAR0\n"); goto err_iounmap; -@@ -551,6 +552,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, + } +@@ -456,6 +457,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, id = ida_simple_get(&pci_endpoint_test_ida, 0, 0, GFP_KERNEL); if (id < 0) { |