[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>

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 19a71f0..1e8e9ad 100644 (file)
--- 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)
 
 static int __devinit atyfb_init(void)
 {
 
 static int __devinit atyfb_init(void)
 {

+    int err1 = 1, err2 = 1;

 #ifndef MODULE
     char *option = NULL;
 
 #ifndef MODULE
     char *option = NULL;
 


@@ -3872,12 +3873,13 @@ static int __devinit atyfb_init(void)
 #endif
 
 #ifdef CONFIG_PCI
 #endif
 
 #ifdef CONFIG_PCI

-    pci_register_driver(&atyfb_driver);
+    err1 = pci_register_driver(&atyfb_driver);

 #endif
 #ifdef CONFIG_ATARI
 #endif
 #ifdef CONFIG_ATARI

-    atyfb_atari_probe();
+    err2 = atyfb_atari_probe();

 #endif
 #endif

-    return 0;
+
+    return (err1 && err2) ? -ENODEV : 0;

 }
 
 static void __exit atyfb_exit(void)
 }
 
 static void __exit atyfb_exit(void)