Commit 140e92ab authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

[PATCH] Char: istallion, fix enabling 



Enable ISA cards before pci_register_driver and then, enable each PCI card in
probe function.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8f8f5a58

drivers/char/istallion.c

+11 −7
Original line number Diff line number Diff line
@@ -3968,6 +3968,10 @@ static int __devinit stli_pciprobe(struct pci_dev *pdev, 
	brdp->state |= BST_PROBED;

	pci_set_drvdata(pdev, brdp);



	EBRDENABLE(brdp);

	brdp->enable = NULL;

	brdp->disable = NULL;



	return 0;

err_null:

	stli_brds[brdp->brdnr] = NULL;
@@ -4054,13 +4058,6 @@ static int stli_initbrds(void) 
	if (retval > 0)

		found += retval;



	retval = pci_register_driver(&stli_pcidriver);

	if (retval && found == 0) {

		printk(KERN_ERR "Neither isa nor eisa cards found nor pci "

				"driver can be registered!\n");

		goto err;

	}



/*

 *	All found boards are initialized. Now for a little optimization, if

 *	no boards are sharing the "shared memory" regions then we can just
@@ -4099,6 +4096,13 @@ static int stli_initbrds(void) 
		}

	}



	retval = pci_register_driver(&stli_pcidriver);

	if (retval && found == 0) {

		printk(KERN_ERR "Neither isa nor eisa cards found nor pci "

				"driver can be registered!\n");

		goto err;

	}



	return 0;

err:

	return retval;