From b1138433b993f02b204a66233c7e014e7df38b32 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Sat, 16 Apr 2005 15:26:21 -0700 Subject: [PATCH] --- yaml --- r: 173 b: refs/heads/master c: 4ad81174edfc22528b845a27620db7542c1ce9a6 h: refs/heads/master i: 171: 90b0919610afc3c3900eaab4cd55f0983b77bdf8 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mthca/mthca_main.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 32eb4177ecbb..8be76abebefb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2714eb5a4fb2b461b452fb8a2f65c8caacdd12d5 +refs/heads/master: 4ad81174edfc22528b845a27620db7542c1ce9a6 diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_main.c b/trunk/drivers/infiniband/hw/mthca/mthca_main.c index 8bd2e3af016d..144aed417faa 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_main.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_main.c @@ -672,7 +672,10 @@ static int __devinit mthca_setup_hca(struct mthca_dev *dev) err = mthca_NOP(dev, &status); if (err || status) { - mthca_err(dev, "NOP command failed to generate interrupt, aborting.\n"); + mthca_err(dev, "NOP command failed to generate interrupt (IRQ %d), aborting.\n", + dev->mthca_flags & MTHCA_FLAG_MSI_X ? + dev->eq_table.eq[MTHCA_EQ_CMD].msi_x_vector : + dev->pdev->irq); if (dev->mthca_flags & (MTHCA_FLAG_MSI | MTHCA_FLAG_MSI_X)) mthca_err(dev, "Try again with MSI/MSI-X disabled.\n"); else