Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 96870
b: refs/heads/master
c: fd5b462
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed May 18, 2008
1 parent 83f9814 commit 56c84de
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 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: eb98630ba02f6a23a2d202be082757a9e9940b2b
refs/heads/master: fd5b462f0b3ae641e39966d1c6cd0dd66100cda5
6 changes: 3 additions & 3 deletions trunk/drivers/block/amiflop.c
Original file line number Diff line number Diff line change
Expand Up @@ -1714,10 +1714,10 @@ static int __init amiga_floppy_init(void)
int i, ret;

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

if (!AMIGAHW_PRESENT(AMI_FLOPPY))
return -ENXIO;
return -ENODEV;

if (register_blkdev(FLOPPY_MAJOR,"fd"))
return -EBUSY;
Expand Down Expand Up @@ -1755,7 +1755,7 @@ static int __init amiga_floppy_init(void)
if (!floppy_queue)
goto out_queue;

ret = -ENXIO;
ret = -ENODEV;
if (fd_probe_drives() < 1) /* No usable drives */
goto out_probe;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/block/z2ram.c
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ z2_init(void)
int ret;

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

ret = -EBUSY;
if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME))
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/input/serio/q40kbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ static int __init q40kbd_init(void)
int error;

if (!MACH_IS_Q40)
return -EIO;
return -ENODEV;

error = platform_driver_register(&q40kbd_driver);
if (error)
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/video/amifb.c
Original file line number Diff line number Diff line change
Expand Up @@ -2261,7 +2261,7 @@ int __init amifb_init(void)
amifb_setup(option);
#endif
if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO))
return -ENXIO;
return -ENODEV;

/*
* We request all registers starting from bplpt[0]
Expand Down Expand Up @@ -2333,7 +2333,7 @@ int __init amifb_init(void)
strcat(fb_info.fix.id, "Unknown");
goto default_chipset;
#else /* CONFIG_FB_AMIGA_OCS */
err = -ENXIO;
err = -ENODEV;
goto amifb_error;
#endif /* CONFIG_FB_AMIGA_OCS */
break;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/hpfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ int __init hpfb_init(void)
#define INTFBPADDR 0x560000

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

if (fb_get_options("hpfb", NULL))
return -ENODEV;
Expand Down

0 comments on commit 56c84de

Please sign in to comment.