UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] matroxfb: Honor the return value of pci_register_driver 

Check the return value of pci_register_driver()

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Antonino A. Daplas 2006-10-03 01:14:52 -07:00 committed by Linus Torvalds
parent c1cc53be0f
commit b0b10324b8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/video/matrox/matroxfb_base.c
View File

@ -2277,10 +2277,13 @@ static void __init matroxfb_init_params(void) {
} }
} }
static void __init matrox_init(void) { static int __init matrox_init(void) {
int err;
matroxfb_init_params(); matroxfb_init_params();
pci_register_driver(&matroxfb_driver); err = pci_register_driver(&matroxfb_driver);
dev = -1; /* accept all new devices... */ dev = -1; /* accept all new devices... */
return err;
} }
/* **************************** exit-time only **************************** */ /* **************************** exit-time only **************************** */
@ -2437,6 +2440,7 @@ static int __initdata initialized = 0;
static int __init matroxfb_init(void) static int __init matroxfb_init(void)
{ {
char *option = NULL; char *option = NULL;
int err = 0;
DBG(__FUNCTION__) DBG(__FUNCTION__)
@ -2448,11 +2452,11 @@ static int __init matroxfb_init(void)
return -ENXIO; return -ENXIO;
if (!initialized) { if (!initialized) {
initialized = 1; initialized = 1;
matrox_init(); err = matrox_init();
} }
hotplug = 1; hotplug = 1;
/* never return failure, user can hotplug matrox later... */ /* never return failure, user can hotplug matrox later... */
return 0; return err;
} }
module_init(matroxfb_init); module_init(matroxfb_init);