diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2006-12-06 23:36:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:34 -0500 |
commit | 8bca98cabf6db738b06d6f3b6d4b6c5f2a5cb7b6 (patch) | |
tree | f68a69c5b841ace15ae19b8e9da21b9ffca726b2 /drivers/block/paride/pf.c | |
parent | 138ae6631a3d6f86851dd53686fa88295d1398bd (diff) |
[PATCH] paride: return proper error code
This patch makes module init return proper value instead of -1 (-EPERM).
Cc: Tim Waugh <tim@cyberelk.net>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block/paride/pf.c')
-rw-r--r-- | drivers/block/paride/pf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c index 1a9dee19efcf..7cdaa1951260 100644 --- a/drivers/block/paride/pf.c +++ b/drivers/block/paride/pf.c | |||
@@ -933,25 +933,25 @@ static int __init pf_init(void) | |||
933 | int unit; | 933 | int unit; |
934 | 934 | ||
935 | if (disable) | 935 | if (disable) |
936 | return -1; | 936 | return -EINVAL; |
937 | 937 | ||
938 | pf_init_units(); | 938 | pf_init_units(); |
939 | 939 | ||
940 | if (pf_detect()) | 940 | if (pf_detect()) |
941 | return -1; | 941 | return -ENODEV; |
942 | pf_busy = 0; | 942 | pf_busy = 0; |
943 | 943 | ||
944 | if (register_blkdev(major, name)) { | 944 | if (register_blkdev(major, name)) { |
945 | for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) | 945 | for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) |
946 | put_disk(pf->disk); | 946 | put_disk(pf->disk); |
947 | return -1; | 947 | return -EBUSY; |
948 | } | 948 | } |
949 | pf_queue = blk_init_queue(do_pf_request, &pf_spin_lock); | 949 | pf_queue = blk_init_queue(do_pf_request, &pf_spin_lock); |
950 | if (!pf_queue) { | 950 | if (!pf_queue) { |
951 | unregister_blkdev(major, name); | 951 | unregister_blkdev(major, name); |
952 | for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) | 952 | for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) |
953 | put_disk(pf->disk); | 953 | put_disk(pf->disk); |
954 | return -1; | 954 | return -ENOMEM; |
955 | } | 955 | } |
956 | 956 | ||
957 | blk_queue_max_phys_segments(pf_queue, cluster); | 957 | blk_queue_max_phys_segments(pf_queue, cluster); |