diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:53:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:53:03 +0200 |
| commit | 009b9fc98ddd83f9139fdabb12c0d7a8535d5421 (patch) | |
| tree | f7d3e182407d2ebe50a9b8db6361ac910027a1cf /drivers/block/amiflop.c | |
| parent | x86: fixup the fallout of the bitops changes (diff) | |
| parent | Slab: Fix memory leak in fallback_alloc() (diff) | |
| download | linux-009b9fc98ddd83f9139fdabb12c0d7a8535d5421.tar.xz linux-009b9fc98ddd83f9139fdabb12c0d7a8535d5421.zip | |
Merge branch 'linus' into x86/threadinfo
Diffstat (limited to 'drivers/block/amiflop.c')
| -rw-r--r-- | drivers/block/amiflop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index c9751b2b57e6..7516baff3bb9 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c @@ -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; @@ -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; |