Skip to content

Commit 206fc80

Browse files
khayash1vijay-suman
authored andcommitted
misc: pci_endpoint_test: Fix displaying 'irq_type' after 'request_irq' error
commit 919d14603dab6a9cf03ebbeb2cfa556df48737c8 upstream. There are two variables that indicate the interrupt type to be used in the next test execution, global "irq_type" and "test->irq_type". The former is referenced from pci_endpoint_test_get_irq() to preserve the current type for ioctl(PCITEST_GET_IRQTYPE). In the pci_endpoint_test_request_irq(), since this global variable is referenced when an error occurs, the unintended error message is displayed. For example, after running "pcitest -i 2", the following message shows "MSI 3" even if the current IRQ type becomes "MSI-X": pci-endpoint-test 0000:01:00.0: Failed to request IRQ 30 for MSI 3 SET IRQ TYPE TO MSI-X: NOT OKAY Fix this issue by using "test->irq_type" instead of global "irq_type". Cc: [email protected] Fixes: b2ba922 ("misc: pci_endpoint_test: Avoid using module parameter to determine irqtype") Reviewed-by: Manivannan Sadhasivam <[email protected]> Signed-off-by: Kunihiko Hayashi <[email protected]> Link: https://lore.kernel.org/r/[email protected] [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński <[email protected]> Signed-off-by: Kunihiko Hayashi <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 30f2cd70c4f90dc4bdb0138595c45396479cbeb6) Signed-off-by: Vijayendra Suman <[email protected]>
1 parent 537c7ee commit 206fc80

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/misc/pci_endpoint_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static bool pci_endpoint_test_request_irq(struct pci_endpoint_test *test)
245245
return true;
246246

247247
fail:
248-
switch (irq_type) {
248+
switch (test->irq_type) {
249249
case IRQ_TYPE_LEGACY:
250250
dev_err(dev, "Failed to request IRQ %d for Legacy\n",
251251
pci_irq_vector(pdev, i));

0 commit comments

Comments
 (0)