From f2970be732a42f7df9afc466bef3440157cda91f Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Tue, 3 Oct 2006 01:14:51 -0700
Subject: [PATCH] --- yaml --- r: 38057 b: refs/heads/master c:
 c1cc53be0fc112cc8cb21ac4e0ab1af0a4082943 h: refs/heads/master i:   38055:
 9783419546749e53efabcaf95162ff22727945b5 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/video/aty/atyfb_base.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ad51530a5fd5..90bdacd62959 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a727dea774c47ad1e18907be33f12c9f325ee4a
+refs/heads/master: c1cc53be0fc112cc8cb21ac4e0ab1af0a4082943
diff --git a/trunk/drivers/video/aty/atyfb_base.c b/trunk/drivers/video/aty/atyfb_base.c
index 19a71f045784..1e8e9ade9396 100644
--- a/trunk/drivers/video/aty/atyfb_base.c
+++ b/trunk/drivers/video/aty/atyfb_base.c
@@ -3863,6 +3863,7 @@ static int __devinit atyfb_setup(char *options)
 
 static int __devinit atyfb_init(void)
 {
+    int err1 = 1, err2 = 1;
 #ifndef MODULE
     char *option = NULL;
 
@@ -3872,12 +3873,13 @@ static int __devinit atyfb_init(void)
 #endif
 
 #ifdef CONFIG_PCI
-    pci_register_driver(&atyfb_driver);
+    err1 = pci_register_driver(&atyfb_driver);
 #endif
 #ifdef CONFIG_ATARI
-    atyfb_atari_probe();
+    err2 = atyfb_atari_probe();
 #endif
-    return 0;
+
+    return (err1 && err2) ? -ENODEV : 0;
 }
 
 static void __exit atyfb_exit(void)