Prev: [patch] hrtimer: cleanup: remove unneeded assignment
Next: [PATCH] kvm: update document of gfns
From: Dan Carpenter on 7 May 2010 04:40
This patch makes it return -ENODEV if we run out of empty slots in the
probe function. It's unlikely to happen, but it makes the static
checkers happy.

Signed-off-by: Dan Carpenter <error27(a)gmail.com>

diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 0fa2e4a..5f24bdb 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -1568,11 +1568,16 @@ static int __devinit isicom_probe(struct pci_dev *pdev,
dev_info(&pdev->dev, "ISI PCI Card(Device ID 0x%x)\n", ent->device);

/* allot the first empty slot in the array */
- for (index = 0; index < BOARD_COUNT; index++)
+ for (index = 0; index < BOARD_COUNT; index++) {
if (isi_card[index].base == 0) {
board = &isi_card[index];
break;
}
+ }
+ if (index == BOARD_COUNT) {
+ retval = -ENODEV;
+ goto err_disable;
+ }

board->index = index;
board->base = pci_resource_start(pdev, 3);
@@ -1619,6 +1624,7 @@ errunrr:
errdec:
board->base = 0;
card_count--;
+err_disable:
pci_disable_device(pdev);
err:
return retval;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [patch] hrtimer: cleanup: remove unneeded assignment
Next: [PATCH] kvm: update document of gfns