Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ed0c0b7 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

[PATCH] Char: 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: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7edc136a

drivers/char/isicom.c

+9 −7
Original line number Diff line number Diff line
@@ -1746,7 +1746,7 @@ static int __devinit load_firmware(struct pci_dev *pdev, 
/*

 *	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)
@@ -1756,7 +1756,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);
@@ -1774,7 +1774,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);
@@ -1784,7 +1784,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,
@@ -1813,8 +1813,10 @@ static int __devinit isicom_probe(struct pci_dev *pdev, 
	free_irq(board->irq, board);

errunrr:

	pci_release_region(pdev, 3);

err:

errdec:

	board->base = 0;

	card_count--;

err:

	return retval;

}
@@ -1828,6 +1830,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)
@@ -1835,8 +1839,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;