The patch titled
paride: return proper error code
has been added to the -mm tree. Its filename is
paride-return-proper-error-code.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: paride: return proper error code
From: Akinobu Mita <akinobu.mita@xxxxxxxxx>
This patch makes module init return proper value instead of -1 (-EPERM).
Cc: Tim Waugh <tim@xxxxxxxxxxxx>
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/block/paride/pcd.c | 8 ++++----
drivers/block/paride/pf.c | 8 ++++----
drivers/block/paride/pg.c | 4 ++--
drivers/block/paride/pt.c | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff -puN drivers/block/paride/pcd.c~paride-return-proper-error-code drivers/block/paride/pcd.c
--- a/drivers/block/paride/pcd.c~paride-return-proper-error-code
+++ a/drivers/block/paride/pcd.c
@@ -912,12 +912,12 @@ static int __init pcd_init(void)
int unit;
if (disable)
- return -1;
+ return -EINVAL;
pcd_init_units();
if (pcd_detect())
- return -1;
+ return -ENODEV;
/* get the atapi capabilities page */
pcd_probe_capabilities();
@@ -925,7 +925,7 @@ static int __init pcd_init(void)
if (register_blkdev(major, name)) {
for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++)
put_disk(cd->disk);
- return -1;
+ return -EBUSY;
}
pcd_queue = blk_init_queue(do_pcd_request, &pcd_lock);
@@ -933,7 +933,7 @@ static int __init pcd_init(void)
unregister_blkdev(major, name);
for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++)
put_disk(cd->disk);
- return -1;
+ return -ENOMEM;
}
for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++) {
diff -puN drivers/block/paride/pf.c~paride-return-proper-error-code drivers/block/paride/pf.c
--- a/drivers/block/paride/pf.c~paride-return-proper-error-code
+++ a/drivers/block/paride/pf.c
@@ -933,25 +933,25 @@ static int __init pf_init(void)
int unit;
if (disable)
- return -1;
+ return -EINVAL;
pf_init_units();
if (pf_detect())
- return -1;
+ return -ENODEV;
pf_busy = 0;
if (register_blkdev(major, name)) {
for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++)
put_disk(pf->disk);
- return -1;
+ return -EBUSY;
}
pf_queue = blk_init_queue(do_pf_request, &pf_spin_lock);
if (!pf_queue) {
unregister_blkdev(major, name);
for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++)
put_disk(pf->disk);
- return -1;
+ return -ENOMEM;
}
blk_queue_max_phys_segments(pf_queue, cluster);
diff -puN drivers/block/paride/pg.c~paride-return-proper-error-code drivers/block/paride/pg.c
--- a/drivers/block/paride/pg.c~paride-return-proper-error-code
+++ a/drivers/block/paride/pg.c
@@ -646,14 +646,14 @@ static int __init pg_init(void)
int err;
if (disable){
- err = -1;
+ err = -EINVAL;
goto out;
}
pg_init_units();
if (pg_detect()) {
- err = -1;
+ err = -ENODEV;
goto out;
}
diff -puN drivers/block/paride/pt.c~paride-return-proper-error-code drivers/block/paride/pt.c
--- a/drivers/block/paride/pt.c~paride-return-proper-error-code
+++ a/drivers/block/paride/pt.c
@@ -946,12 +946,12 @@ static int __init pt_init(void)
int err;
if (disable) {
- err = -1;
+ err = -EINVAL;
goto out;
}
if (pt_detect()) {
- err = -1;
+ err = -ENODEV;
goto out;
}
_
Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are
sc1200wdt-fix-missing-pnp_unregister_driver.patch
isdn-gigaset-avoid-cs-dev-null-pointer-dereference.patch
debugfs-check-return-value-correctly.patch
lightning-return-proper-return-code.patch
git-mtd.patch
git-pcmcia.patch
pci-fix-__pci_register_driver-error-handling.patch
edac_mc-fix-error-handling.patch
paride-return-proper-error-code.patch
bit-revese-library.patch
crc32-replace-bitreverse-by-bitrev32.patch
video-use-bitrev8.patch
net-use-bitrev8.patch
isdn-hisax-use-bitrev8.patch
atm-ambassador-use-bitrev8.patch
isdn-gigaset-use-bitrev8.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
