Char: isicom, correct probing/removing
PATCH 1/1 Char: isicom, correct probing/removing
isicom, correct probing/removing
Don't forget to decrease card_count in fail paths and in remove function. Also null board->base in such cases to point out, that this structure is unused and thus can be reassigned.
Signed-off-by Jiri Slaby <[email protected]>
---
commit ab95fdae2db7f8fded639796814079441f04a3e2
tree 07b12dfe0e0c1e79c79aac160a5ccd24e2cfa3d3
parent f2aae537dbeeed215a444f386f0cf6dd93a463fd
author Jiri Slaby <[email protected]> Tue, 19 Dec 2006 00:55:13 +0100 committer Jiri Slaby <[email protected]> Tue, 19 Dec 2006 00:55:13 +0100
drivers/char/isicom.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)
drivers/char/isicom.c +9 -7
@@ -1747,7 +1747,7 @@ end:/* * Insmod can set static symbols so keep these static */ -static int card; +static unsigned int card_count;static int __devinit isicom_probe (struct pci_dev *pdev,const struct pci_device_id *ent)
@@ -1757,7 +1757,7 @@ static int __devinit isicom_probe(struct pci_dev *pdev,u8 pciirq;struct isi_board *board =NULL ; -if (card >=BOARD_COUNT ) +if (card_count >=BOARD_COUNT ) goto err; ioaddr =pci_resource_start (pdev,3 );
@@ -1775,7 +1775,7 @@ static int __devinit isicom_probe(struct pci_dev *pdev, board->index = index; board->base = ioaddr; board->irq = pciirq; - card++; + card_count++;pci_set_drvdata (pdev, board);
@@ -1785,7 +1785,7 @@ static int __devinit isicom_probe(struct pci_dev *pdev,"will be disabled.\n" , board->base, board->base +15 , index + 1); retval = -EBUSY ; - goto err; + goto errdec; } retval = request_irq(board->irq, isicom_interrupt,
@@ -1814,8 +1814,10 @@ errunri:free_irq (board->irq, board); errunrr:pci_release_region (pdev,3 ); -err: +errdec: board->base =0 ; + card_count--; +err:return retval; }
@@ -1829,6 +1831,8 @@ static void __devexit isicom_remove(struct pci_dev *pdev)free_irq (board->irq, board);pci_release_region (pdev,3 ); + board->base =0 ; + card_count--; }static int __init isicom_init (void )
@@ -1836,8 +1840,6 @@ static int __init isicom_init(void)int retval, idx, channel;struct isi_port *port; - card =0 ; -for (idx =0 ; idx <BOARD_COUNT ; idx++) { port = &isi_ports[idx *16 ]; isi_card[idx].ports = port;