From 5c69ea47f3217c542f281a3f4e3003ede6e19959 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Tue, 4 Mar 2008 14:29:17 -0800 Subject: [PATCH] --- yaml --- r: 86828 b: refs/heads/master c: 07fb6f26bab869fc3bb9df0a785ba734f4c51ac3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/isicom.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 79a010bb5e3e..b8247e5a1b6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb59e9f1e9786635ea12e12bf6adbb132e10f979 +refs/heads/master: 07fb6f26bab869fc3bb9df0a785ba734f4c51ac3 diff --git a/trunk/drivers/char/isicom.c b/trunk/drivers/char/isicom.c index 85d596a3c18c..eba2883b630e 100644 --- a/trunk/drivers/char/isicom.c +++ b/trunk/drivers/char/isicom.c @@ -1527,7 +1527,7 @@ static int __devinit reset_card(struct pci_dev *pdev, msleep(10); portcount = inw(base + 0x2); - if (!inw(base + 0xe) & 0x1 || (portcount != 0 && portcount != 4 && + if (!(inw(base + 0xe) & 0x1) || (portcount != 0 && portcount != 4 && portcount != 8 && portcount != 16)) { dev_err(&pdev->dev, "ISILoad:PCI Card%d reset failure.\n", card + 1);