Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 102386
b: refs/heads/master
c: e945b56
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Jul 21, 2008
1 parent d624090 commit d8804ce
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 038eddd9acf34e8202b31af3ee9eb48179114323
refs/heads/master: e945b568e28b42de893ef24989372f0219501d32
4 changes: 2 additions & 2 deletions trunk/drivers/block/ataflop.c
Original file line number Diff line number Diff line change
Expand Up @@ -1880,11 +1880,11 @@ static int __init atari_floppy_init (void)

if (!MACH_IS_ATARI)
/* Amiga, Mac, ... don't have Atari-compatible floppy :-) */
return -ENXIO;
return -ENODEV;

if (MACH_IS_HADES)
/* Hades doesn't have Atari-compatible floppy */
return -ENXIO;
return -ENODEV;

if (register_blkdev(FLOPPY_MAJOR,"fd"))
return -EBUSY;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/nvram.c
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ nvram_init(void)

/* First test whether the driver should init at all */
if (!CHECK_DRIVER_INIT())
return -ENXIO;
return -ENODEV;

ret = misc_register(&nvram_dev);
if (ret) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/input/keyboard/atakbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static int __init atakbd_init(void)
int i, error;

if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP))
return -EIO;
return -ENODEV;

// need to init core driver if not already done so
if (atari_keyb_init())
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/atafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -3110,7 +3110,7 @@ int __init atafb_init(void)
printk("atafb_init: start\n");

if (!MACH_IS_ATARI)
return -ENXIO;
return -ENODEV;

do {
#ifdef ATAFB_EXT
Expand Down

0 comments on commit d8804ce

Please sign in to comment.