Skip to content

Commit

Permalink
[PATCH] matroxfb: Honor the return value of pci_register_driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Antonino A. Daplas authored and Linus Torvalds committed Oct 3, 2006
1 parent c1cc53b commit b0b1032
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions drivers/video/matrox/matroxfb_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
pci_register_driver(&matroxfb_driver);
err = pci_register_driver(&matroxfb_driver);
dev = -1; /* accept all new devices... */
return err;
}

/* **************************** exit-time only **************************** */
Expand Down Expand Up @@ -2437,6 +2440,7 @@ static int __initdata initialized = 0;
static int __init matroxfb_init(void)
{
char *option = NULL;
int err = 0;

DBG(__FUNCTION__)

Expand All @@ -2448,11 +2452,11 @@ static int __init matroxfb_init(void)
return -ENXIO;
if (!initialized) {
initialized = 1;
matrox_init();
err = matrox_init();
}
hotplug = 1;
/* never return failure, user can hotplug matrox later... */
return 0;
return err;
}

module_init(matroxfb_init);
Expand Down

0 comments on commit b0b1032

Please sign in to comment.