chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Fix warnings when not checking pci_register_driver return codes.

Browse Source 
* 3dfx_driver.c (findCards): Return int instead of void , and normalize
	error code to be always negative, otherwise return numCards.
	(init_module): Check for findCards return code, print a warning and
	exit the module on error.
	(init_3dfx): Likewise.
This commit is contained in:
guillemj
2007-02-06 04:50:34 +00:00
parent 6fccc2cbdb
commit 1f3ee6bb30
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Device3Dfx/3dfx_driver.c
View File

@@ -289,9 +289,16 @@ static int findCards(void)
#else
static struct pci_driver driver_3dfx;
static void findCards(void)
static int findCards(void)
{
pci_register_driver(&driver_3dfx);
int error;
error = pci_register_driver(&driver_3dfx);
if (error)
return error < 0 ? error : -error;
else
return numCards;
}
#endif
@@ -828,7 +835,11 @@ int init_module(void)
#endif
DEBUGMSG(("3dfx: Successfully registered device 3dfx\n"));
findCards();
ret = findCards();
if (ret < 0) {
printk("3dfx: findCards() failed, returned %d\n", ret);
return ret;
}
#ifdef CONFIG_MTRR
ret = setmtrr_3dfx();
@@ -872,11 +883,18 @@ void cleanup_module(void)
long init_3dfx(long mem_start, long mem_end)
{
int ret;
if (register_chrdev(MAJOR_3DFX, "3dfx", &fops_3dfx)) {
DEBUGMSG(("3dfx: Unable to register_chrdev with major %d\n", MAJOR_3DFX));
return 0;
}
findCards();
ret = findCards();
if (ret < 0) {
printk("3dfx: findCards() failed, returned %d\n", ret);
return 0;
}
return mem_start;
}

10
Device3Dfx/ChangeLog
View File

@@ -1,3 +1,13 @@
2007-02-06 Guillem Jover <guillem@hadrons.org>
Fix warnings when not checking pci_register_driver return codes.
* 3dfx_driver.c (findCards): Return int instead of void , and normalize
error code to be always negative, otherwise return numCards.
(init_module): Check for findCards return code, print a warning and
exit the module on error.
(init_3dfx): Likewise.
2007-02-06 Guillem Jover <guillem@hadrons.org>
* 3dfx_driver.c (HAVE_DEVFS): Define to 1 if