diff options
author | Antonino A. Daplas <adaplas@gmail.com> | 2006-10-03 04:14:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:10 -0400 |
commit | c1cc53be0fc112cc8cb21ac4e0ab1af0a4082943 (patch) | |
tree | 92c583d626cfb7ebab072c7fff72a2fa87a54fec /drivers/video/aty | |
parent | 0a727dea774c47ad1e18907be33f12c9f325ee4a (diff) |
[PATCH] atyfb: Honor the return value of pci_register_driver
Check 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>
Diffstat (limited to 'drivers/video/aty')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 19a71f045784..1e8e9ade9396 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -3863,6 +3863,7 @@ static int __devinit atyfb_setup(char *options) | |||
3863 | 3863 | ||
3864 | static int __devinit atyfb_init(void) | 3864 | static int __devinit atyfb_init(void) |
3865 | { | 3865 | { |
3866 | int err1 = 1, err2 = 1; | ||
3866 | #ifndef MODULE | 3867 | #ifndef MODULE |
3867 | char *option = NULL; | 3868 | char *option = NULL; |
3868 | 3869 | ||
@@ -3872,12 +3873,13 @@ static int __devinit atyfb_init(void) | |||
3872 | #endif | 3873 | #endif |
3873 | 3874 | ||
3874 | #ifdef CONFIG_PCI | 3875 | #ifdef CONFIG_PCI |
3875 | pci_register_driver(&atyfb_driver); | 3876 | err1 = pci_register_driver(&atyfb_driver); |
3876 | #endif | 3877 | #endif |
3877 | #ifdef CONFIG_ATARI | 3878 | #ifdef CONFIG_ATARI |
3878 | atyfb_atari_probe(); | 3879 | err2 = atyfb_atari_probe(); |
3879 | #endif | 3880 | #endif |
3880 | return 0; | 3881 | |
3882 | return (err1 && err2) ? -ENODEV : 0; | ||
3881 | } | 3883 | } |
3882 | 3884 | ||
3883 | static void __exit atyfb_exit(void) | 3885 | static void __exit atyfb_exit(void) |