aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2008-07-17 15:16:10 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-20 20:24:38 -0400
commite945b568e28b42de893ef24989372f0219501d32 (patch)
treeb14af0806136067685a96832abcf05b46f99980b
parent038eddd9acf34e8202b31af3ee9eb48179114323 (diff)
m68k: Return -ENODEV if no device is found
According to the tests in do_initcalls(), the proper error code in case no device is found is -ENODEV, not -ENXIO or -EIO. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/block/ataflop.c4
-rw-r--r--drivers/char/nvram.c2
-rw-r--r--drivers/input/keyboard/atakbd.c2
-rw-r--r--drivers/video/atafb.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 424995073c6b..49f274197b16 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1880,11 +1880,11 @@ static int __init atari_floppy_init (void)
1880 1880
1881 if (!MACH_IS_ATARI) 1881 if (!MACH_IS_ATARI)
1882 /* Amiga, Mac, ... don't have Atari-compatible floppy :-) */ 1882 /* Amiga, Mac, ... don't have Atari-compatible floppy :-) */
1883 return -ENXIO; 1883 return -ENODEV;
1884 1884
1885 if (MACH_IS_HADES) 1885 if (MACH_IS_HADES)
1886 /* Hades doesn't have Atari-compatible floppy */ 1886 /* Hades doesn't have Atari-compatible floppy */
1887 return -ENXIO; 1887 return -ENODEV;
1888 1888
1889 if (register_blkdev(FLOPPY_MAJOR,"fd")) 1889 if (register_blkdev(FLOPPY_MAJOR,"fd"))
1890 return -EBUSY; 1890 return -EBUSY;
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 197cd7a0c332..a22662b6a1a5 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -444,7 +444,7 @@ nvram_init(void)
444 444
445 /* First test whether the driver should init at all */ 445 /* First test whether the driver should init at all */
446 if (!CHECK_DRIVER_INIT()) 446 if (!CHECK_DRIVER_INIT())
447 return -ENXIO; 447 return -ENODEV;
448 448
449 ret = misc_register(&nvram_dev); 449 ret = misc_register(&nvram_dev);
450 if (ret) { 450 if (ret) {
diff --git a/drivers/input/keyboard/atakbd.c b/drivers/input/keyboard/atakbd.c
index 4e92100c56a8..1839194ea987 100644
--- a/drivers/input/keyboard/atakbd.c
+++ b/drivers/input/keyboard/atakbd.c
@@ -220,7 +220,7 @@ static int __init atakbd_init(void)
220 int i, error; 220 int i, error;
221 221
222 if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP)) 222 if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP))
223 return -EIO; 223 return -ENODEV;
224 224
225 // need to init core driver if not already done so 225 // need to init core driver if not already done so
226 if (atari_keyb_init()) 226 if (atari_keyb_init())
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index dff35474b854..c8605730a1b0 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -3110,7 +3110,7 @@ int __init atafb_init(void)
3110 printk("atafb_init: start\n"); 3110 printk("atafb_init: start\n");
3111 3111
3112 if (!MACH_IS_ATARI) 3112 if (!MACH_IS_ATARI)
3113 return -ENXIO; 3113 return -ENODEV;
3114 3114
3115 do { 3115 do {
3116#ifdef ATAFB_EXT 3116#ifdef ATAFB_EXT